vimrc: Also display non breakable space with 'listchars'.

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 2df92ecac98112065708f014a1c64a349c6da3e2..d5555c48b1f39a0b1ddcfc2ae387cf1cfac9a476 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -1,6 +1,8 @@
 " Vim main configuration file.
 
 
+" EDITOR SETTINGS
+
 " Make sure Vim (and not Vi) settings are enabled.
 set nocompatible
 
@@ -9,9 +11,6 @@ set nocompatible
 set runtimepath-=~/.vim
 set runtimepath^=~/.vim,~/.vim/plugins,~/.vim/runtime
 
-
-" EDITOR SETTINGS
-
 " When completing paths first use the longest path then display a list of all
 " possible files.
 set wildmode=longest,list
@@ -72,7 +71,8 @@ set incsearch
 if has("folding")
     set foldmethod=syntax
     set foldcolumn=2
-    set foldlevel=99 " no folding at default
+    set foldlevel=99 " no closed folds at default, 'foldenable' would disable
+                     " folding which is not what I want
 endif
 
 " Only check for case if the searched word contains a capital character.
@@ -85,6 +85,9 @@ if v:version >= 700
     set spelllang=en_us
 endif
 
+" Allow buffers with changes to be hidden.
+set hidden
+
 
 " DISPLAY SETTINGS
 
@@ -103,9 +106,9 @@ if v:version >= 700
     set cursorline
 endif
 
-" Display tabs as "^I" and trailing space as "-".
+" Display tabs, trailing space and non breakable spaces.
 set list
-set listchars=trail:-
+set listchars=trail:-,nbsp:!
 
 
 " MAPPINGS (except for plugins, see PLUGIN SETTINGS below)
@@ -114,13 +117,16 @@ set listchars=trail:-
 nnoremap <Space> <C-f>
 nnoremap - <C-b>
 
-" Maps to change spell language between English and German.
-map <Leader>se :set spelllang=en_us<CR>
-map <Leader>sd :set spelllang=de_de<CR>
+" Maps to change spell language between English and German and disable it.
+if v:version >= 700
+    map <Leader>sn :set nospell<CR>
+    map <Leader>se :set spell spelllang=en_us<CR>
+    map <Leader>sd :set spell spelllang=de_de<CR>
+endif
 
 " Add semicolon to the end of the line. Thanks to
 " http://www.van-laarhoven.org/vim/.vimrc for this idea and godlygeek in #vim
-" for an improved version which doesn't clobber any marks.
+" on Freenode for an improved version which doesn't clobber any marks.
 nnoremap <silent> ; :call setline(line('.'), getline('.') . ';')<CR>
 
 " I often type "W" instead of "w" when trying to save a file. Fix my mistake.