X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fskel%2F.vimrc;h=7ef9a4297533d3bacea07836a0068542bd875857;hb=0fae683b56c9e90be53083b306235fefea697b65;hp=cd83d23426e3ef0af31569e8b8598d50c9de9cdc;hpb=9c3b6dc030abd09b1ed0660cc27328b2f08f7da7;p=grml-etc-core.git

diff --git a/etc/skel/.vimrc b/etc/skel/.vimrc
index cd83d23..7ef9a42 100644
--- a/etc/skel/.vimrc
+++ b/etc/skel/.vimrc
@@ -3,7 +3,6 @@
 " Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 " Bug-Reports:   see http://grml.org/bugs/
 " License:       This file is licensed under the GPL v2.
-" Latest change: Son Apr 01 19:33:19 CEST 2007 [mika]
 "###############################################################################
 " Thanks to Sven Guckes for his template!
 "###############################################################################
@@ -11,9 +10,10 @@
 " be no-compatible with vi
   set nocp
 " turn these ON:
-  set digraph ek hidden ruler sc vb wmnu
+  set ek hidden ruler sc vb wmnu
+" set digraph
 " turn these OFF ("no" prefix):
-  set noeb noet nosol
+  set nodigraph noeb noet nosol
 " non-toggles:
   set bs=2 fo=cqrt ls=2 shm=at ww=<,>,h,l
 " set bs=2 fo=cqrt ls=2 shm=at tw=72 ww=<,>,h,l
@@ -25,16 +25,19 @@
 
 " autocommands:
 " when the file type is "mail" then set the textwidth to "70":
-  au FileType mail   set tw=70
+  if has("autocmd")
+     au FileType mail   set tw=70
 " When editing a file, always jump to the last cursor position
 "  au BufReadPost * if line("'\"") | exe "'\"" | endif
-  autocmd BufReadPost * if line("'\"") && line("'\"") <= line("$") | exe "normal `\"" | endif
+     autocmd BufReadPost * if line("'\"") && line("'\"") <= line("$") | exe "normal `\"" | endif
+  endif
 
 " some colors - as an example "white on black" [use bold fonts]:
 "  hi normal   ctermfg=white  ctermbg=black guifg=white  guibg=black
 "  hi nontext  ctermfg=blue   ctermbg=black guifg=blue   guibg=black
-" switch on syntax coloring!! "bunt ist meine lieblingsfarbe!" :-)
-  syn on
+  if has("syntax")
+     syn on
+  endif
 " set t_Co=256                " number of colors
 
 " some useful mappings:
@@ -80,6 +83,11 @@
     source /usr/share/doc/mercurial/examples/vim/hg-menu.vim
   endif
 
+" source local configuration file
+  if filereadable(expand("$HOME/.vimrc.local"))
+     source $HOME/.vimrc.local
+  endif
+
 " Vim 7 brings cool new features - see ':he version7'!
 " The coolest features of Vim7 by mika
 " ====================================
@@ -112,7 +120,7 @@ if version >= 700
     map <F12> :set spell!<CR><Bar>:echo "Spell Check: " . strpart("OffOn", 3 * &spell, 3)<CR>
     set spellfile=~/.vim/spellfile.add
   " change language -  get spell files from http://ftp.vim.org/pub/vim/runtime/spell/ =>
-  " cd ~/.vim/spell && wget http://ftp.vim.org/pub/vim/runtime/spell/de.latin1.spl
+  " cd ~/.vim/spell && wget http://ftp.vim.org/pub/vim/runtime/spell/de.{latin1,utf-8}.spl
   " change to german:
   "  set spelllang=de
   " highlight spelling correction: