X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=vimrc;h=1dfdbfcbd292a9df31521e3dacaaeb2ab30fd51a;hb=11e37bdc2b784f00f65008f4d4cdf36917700d22;hp=386961cb5f2e5487dcacc5fdb89f37114e9d48f1;hpb=28f65782f112ca952a9e068fbcc8677ef1dc4fbf;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 386961c..1dfdbfc 100644
--- a/vimrc
+++ b/vimrc
@@ -19,11 +19,6 @@ 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
 
@@ -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
@@ -97,10 +92,11 @@ set hidden
 
 " DISPLAY SETTINGS
 
-" Use a dark background.
+" Use a dark background. Doesn't change the background color, only sets 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 +111,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 +135,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>
@@ -194,8 +194,9 @@ endif
 if has('syntax')
     syntax enable
 
-" Highlight text longer then 78 characters. Thanks to Tony Mechelynck
+" Highlight text 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
@@ -247,10 +248,10 @@ if has('autocmd')
 " 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.
+" 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.
+" Use the same comment string as for Vim files in vimperator files.
         autocmd FileType vimperator setlocal commentstring=\"%s
 
 " FTDETECT AUTO COMMANDS