]>
Commit | Line | Data |
---|---|---|
98d45eb4 AM |
1 | --- vim-7.4.2189/runtime/vimrc_example.vim~ 2016-08-09 22:14:05.000000000 +0200 |
2 | +++ vim-7.4.2189/runtime/vimrc_example.vim 2016-08-09 22:20:44.071303413 +0200 | |
3 | @@ -26,7 +23,7 @@ else | |
4 | endif | |
5 | endif | |
6 | ||
7 | -if &t_Co > 2 || has("gui_running") | |
8 | +if (&t_Co > 2 || has("gui_running")) && filereadable($VIMRUNTIME."/syntax/syntax.vim") | |
9 | " Switch on highlighting the last used search pattern. | |
10 | set hlsearch | |
11 | endif | |
12 | @@ -56,3 +53,11 @@ endif " has("autocmd") | |
13 | if has('syntax') && has('eval') | |
14 | packadd matchit | |
15 | endif | |
16 | + | |
17 | +" Use :help colorscheme for info | |
18 | +"set background=dark | |
19 | + | |
20 | +" Source a global configuration file if available | |
21 | +if filereadable("/etc/vim/vimrc.local") | |
22 | + source /etc/vim/vimrc.local | |
23 | +endi | |
24 | --- vim-7.4.2189/runtime/defaults.vim~ 2016-08-09 22:14:05.000000000 +0200 | |
25 | +++ vim-7.4.2189/runtime/defaults.vim 2016-08-09 22:26:29.727124083 +0200 | |
26 | @@ -53,9 +53,9 @@ inoremap <C-U> <C-G>u<C-U> | |
66e92215 | 27 | |
98d45eb4 AM |
28 | " In many terminal emulators the mouse works just fine. By enabling it you |
29 | " can position the cursor, Visually select and scroll with the mouse. | |
66e92215 ER |
30 | -if has('mouse') |
31 | - set mouse=a | |
32 | -endif | |
33 | +"if has('mouse') | |
34 | +" set mouse=a | |
35 | +"endif | |
36 | ||
a39abb00 AM |
37 | " Switch syntax highlighting on when the terminal has colors or when using the |
38 | " GUI (which always has colors). | |
98d45eb4 | 39 | @@ -99,7 +99,7 @@ endif " has("autocmd") |
35973592 ER |
40 | " file it was loaded from, thus the changes you made. |
41 | " Only define it when not defined already. | |
98d45eb4 | 42 | " Revert with: ":delcommand DiffOrig". |
66e92215 ER |
43 | -if !exists(":DiffOrig") |
44 | +if v:progname =~! "vi" && !exists(":DiffOrig") | |
7928792f | 45 | command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ | diffthis |
66e92215 ER |
46 | \ | wincmd p | diffthis |
47 | endif |