vimrc: Fix highlight of Unicode whitespace.

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 83ad31581554ef4fd25b2e1e0017344645303abe..79e709a8d1d508282a306aba6d52e8b084931f3d 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -139,7 +139,11 @@ set incsearch
 " Activate syntax folding.
 if has('folding')
     set foldmethod=syntax
-    set foldcolumn=2
+    " Only use fold column if we have enough space (for example in a (virtual)
+    " terminals).
+    if &columns > 80
+        set foldcolumn=2
+    endif
     set foldlevel=99 " no closed folds at default, 'foldenable' would disable
                      " folding which is not what I want
 endif
@@ -530,9 +534,10 @@ if has('syntax')
                           \ '2003', '2004', '2005', '2006', '2007', '2008',
                           \ '2009', '200a', '200b', '200c', '200d', '202f',
                           \ '205f', '2060', '3000', 'feff']
-            " Compatibility fix for Vim 6.4.
+            " Compatibility fix for Vim 6.4. Escape \ inside the " string or
+            " it won't work!
             execute '  for l:x in l:spaces'
-                  \ '|     call matchadd("Error", "\%u" . l:x)'
+                  \ '|     call matchadd("Error", "\\%u" . l:x)'
                   \ '| endfor'
         endif
     endfunction
@@ -641,8 +646,11 @@ if has('autocmd')
 " Don't ignore case while in insert mode, but ignore case in all other modes.
 " This causes <C-N>/<C-P> to honor the case and thus only complete matching
 " capitalization. But while searching (/) 'ignorecase' is used.
-        autocmd InsertEnter * set noignorecase
-        autocmd InsertLeave * set   ignorecase
+" InsertEnter/InsertLeave doesn't exist in older Vims.
+        if exists('##InsertEnter') && exists('##InsertLeave')
+            autocmd InsertEnter * set noignorecase
+            autocmd InsertLeave * set   ignorecase
+        endif
 
 " AFTER/FTPLUGIN AUTO COMMANDS