vimrc: fix syntax when reloading vimrc

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index fb56e0cf08f2f61314aa5881e37e4bbbfb07d60d..4860c7fac09feb6cd622aa76ba9e0f6dcb1a9552 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -449,10 +449,10 @@ if has('statusline')
     set statusline+=:
     if has('modify_fname') && v:version >= 700 " some functions need 7.0
         set statusline+=%{SRF()}      " path to current file
-        set statusline+=\             " space after path
     else
-        set statusline+=%f\           " path to current file in buffer
+        set statusline+=%f            " path to current file in buffer
     endif
+    set statusline+=\                 " space after path
     set statusline+=%h                " [help] if buffer is help file
     set statusline+=%w                " [Preview] if buffer is preview buffer
     set statusline+=%m                " [+] if buffer was modified,
@@ -763,7 +763,11 @@ inoreabbrev completly completely
 
 " Activate syntax coloring.
 if has('syntax')
-    syntax enable
+    " But only if it wasn't already active. Prevents breaking the syntax
+    " coloring when reloading the vimrc. Thanks to johnLate for the idea.
+    if !exists('g:syntax_on')
+        syntax enable
+    endif
 
 " Don't highlight more than 500 columns as I normally don't have that long
 " lines and they slow down syntax coloring. Thanks to Derek Wyatt
@@ -809,7 +813,7 @@ if has('syntax')
 
         if exists('*matchadd')
 " Highlight some important keywords in all documents.
-            let l:todos = ['TODO', 'XXX', 'FIXME',
+            let l:todos = ['TODO', 'XXX', 'FIXME', 'NOTE',
                          \ 'CHANGED', 'REMOVED', 'DELETED']
             " Compatibility fix for Vim 6.4 which can't handle for in function
             " (without function it's ignored).