X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=48116afca437a22d5092263c9405a6e7c0d439c0;hb=56cade69ee1ba2defc7e81f75860b0c59d41d1a1;hp=59926eb4a784828bd906aa7f3522cb2db5c628a5;hpb=9f610fb453be88ea9c03a451054eb3c6d0e62efa;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 59926eb..48116af 100644
--- a/vimrc
+++ b/vimrc
@@ -6,10 +6,10 @@
 " Make sure Vim (and not Vi) settings are used.
 set nocompatible
 
-" Load my scripts from ~/.vim (my scripts), ~/.vim/plugins (plugins) and
-" ~/.vim/runtime (checkout of Vim runtime files).
+" Load my scripts from ~/.vim (my scripts) and ~/.vim/runtime (checkout of Vim
+" runtime files).
 set runtimepath-=~/.vim
-set runtimepath^=~/.vim,~/.vim/plugins,~/.vim/runtime
+set runtimepath^=~/.vim,~/.vim/runtime
 
 " Disable modelines as they may cause security problems. Instead use
 " securemodelines (Vim script #1876).
@@ -19,15 +19,10 @@ set nomodeline
 " possible files.
 set wildmode=longest,list
 
-" Increase number of tabs which can be opened with the -p option.
-if v:version >= 700
-    set tabpagemax=50
-endif
-
 
 " EDIT SETTINGS
 
-" Enable automatic file detection, plugin and indention.
+" Enable automatic file detection, plugin and indention support.
 if has('autocmd')
     filetype plugin indent on
 endif
@@ -43,7 +38,7 @@ set textwidth=78
 set shiftwidth=4
 set softtabstop=4
 set expandtab
-" When < and > is used indent/deindent to the next shiftwidth boundary.
+" When < and > is used indent/deindent to the next 'shiftwidth' boundary.
 set shiftround
 " Use the default value for real tabs.
 set tabstop=8
@@ -91,16 +86,18 @@ if v:version >= 700 && !&diff
     set spelllang=en_us
 endif
 
-" Allow buffers with changes to be hidden.
+" Allow buffers with changes to be hidden. Very important for effective
+" editing with multiple buffers.
 set hidden
 
 
 " DISPLAY SETTINGS
 
-" Use a dark background.
+" Use a dark background. Doesn't change the background color, only sets text
+" colors for a dark terminal.
 set background=dark
 
-" Activate lines display.
+" Display line numbers.
 set number
 " Display the ruler with current line/file position.
 set ruler
@@ -115,7 +112,10 @@ endif
 " Display tabs, trailing space, non breakable spaces and long lines (when
 " wrapping is enabled).
 set list
-set listchars=trail:-,nbsp:!,extends:>
+set listchars=trail:-,extends:>
+if v:version >= 700
+    set listchars+=nbsp:!
+endif
 
 
 " MAPPINGS (except for plugins, see PLUGIN SETTINGS below)
@@ -136,7 +136,8 @@ nnoremap <Leader>8 :8b<CR>
 nnoremap <Leader>9 :9b<CR>
 nnoremap <Leader>0 :10b<CR>
 
-" Maps to change spell language between English and German and disable it.
+" Maps to change spell language between English and German and disable spell
+" checking.
 if v:version >= 700
     map <Leader>sn :set nospell<CR>
     map <Leader>se :set spell spelllang=en_us<CR>
@@ -179,7 +180,7 @@ endif
 " doesn't send escape). filereadable() is necessary for Leopard were 'mac' is
 " no longer set on the console.
 if has('mac') || filereadable('/Users/.localized')
-    imap <Char-0xa0> <Space>
+    inoremap <Char-0xa0> <Space>
 endif
 
 " Disable Apple style movements in MacVim.
@@ -194,8 +195,9 @@ endif
 if has('syntax')
     syntax enable
 
-" Highlight text longer then 78 characters. Thanks to Tony Mechelynck
+" Highlight lines longer than 78 characters. Thanks to Tony Mechelynck
 " <antoine.mechelynck@gmail.com> from the Vim mailing list.
+" It can easily be disabled if necessary with :2match (in Vim >= 700).
     if v:version >= 700
         2match Todo /\%>78v./
     else
@@ -228,6 +230,40 @@ if has('autocmd')
     augroup vimrc
         autocmd!
 
+" Go to last position of opened files. Taken from :help last-position-jump.
+        autocmd BufReadPost *
+            \ if line("'\"") > 1 && line("'\"") <= line("$") |
+            \     execute "normal! g'\"" |
+            \ endif
+
+" AFTER/FTPLUGIN AUTO COMMANDS
+
+" Disable spell checking for files which don't need it.
+        autocmd FileType deb  setlocal nospell
+        autocmd FileType diff setlocal nospell
+        autocmd FileType tar  setlocal nospell
+" Fix to allow Vim edit crontab files as crontab doesn't work with
+" backupcopy=auto.
+        autocmd FileType crontab setlocal backupcopy=yes
+" Don't use the modeline as the diff created by `git commit -v` may contain
+" one which could change the filetype or other settings of the commit window.
+        autocmd FileType gitcommit setlocal nomodeline |
+                                 \ let g:secure_modelines_allowed_items = []
+" Allow folding in perl.
+        autocmd FileType perl let perl_fold = 1 |
+                            \ let perl_fold_blocks = 1
+" Use the same comment string as for Vim files in vimperator files.
+        autocmd FileType vimperator setlocal commentstring=\"%s
+
+" FTDETECT AUTO COMMANDS
+
+" Recognize .md as markdown files (Vim default is .mkd).
+        autocmd BufRead,BufNewFile *.md set filetype=mkd
+" Recognize .test as Tcl files.
+        autocmd BufRead,BufNewFile *.test set filetype=tcl
+
+" OTHER AUTO COMMANDS
+
 " Use diff filetype for mercurial patches in patch queue.
         autocmd BufReadPost */.hg/patches/* set filetype=diff