X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=4f38ca011e293addf63bfd92d2cdb1f5d9a5dd88;hb=005ce3d0ee890555ce3dd0c71de790370e6d3e53;hp=fb56e0cf08f2f61314aa5881e37e4bbbfb07d60d;hpb=b7bd0305f0ec33a7c3b49e9eb6416e0be65a9417;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index fb56e0c..4f38ca0 100644
--- 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,
@@ -491,8 +491,10 @@ cnoremap jk <C-C>
 " And fix my typos ...
 inoremap JK <Esc>
 inoremap Jk <Esc>
+inoremap jK <Esc>
 cnoremap JK <C-C>
 cnoremap Jk <C-C>
+cnoremap jK <C-C>
 
 " Disable arrow keys for all modes except command modes. Thanks to James Vega
 " (http://git.jamessan.com/?p=etc/vim.git;a=summary).
@@ -763,7 +765,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 +815,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).