X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=e268673748a764a24cb91eaaf6ff540066ef2e56;hb=4ea4a534a42b4ea3407bfe541a42521c6d0301fa;hp=d0c490c2f187fc4cda6220a30161fdce94203599;hpb=938d32799f6c7db3ad1579ba43ee10750e3f710a;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index d0c490c..e268673 100644
--- a/vimrc
+++ b/vimrc
@@ -483,12 +483,10 @@ endif
 " modified by a plugin or other settings. Except for <Nop> which isn't
 " affected by mappings.
 
-" Easy way to exit insert mode. jk is preferred because it's faster.
-inoremap jj <Esc>
+" Easy way to exit insert mode (jj is too slow).
 inoremap jk <Esc>
 " Also for command mode, thanks to http://github.com/mitechie/pyvim
 " (2010-10-15).
-cnoremap jj <C-C>
 cnoremap jk <C-C>
 
 " Disable arrow keys for all modes except command modes. Thanks to James Vega
@@ -981,13 +979,17 @@ if has('autocmd')
         endif
 
 " Display a warning when editing a file which contains "do not edit" (ignoring
-" the case, \c), for example template files which were preprocessed or
-" auto-generated files. Especially useful when the header is not displayed on
-" the first screen, e.g. when the old position is restored. Not for vimrc
-" though.
+" the case) in the first lines of the file, for example template files which
+" were preprocessed or auto-generated files. Especially useful when the header
+" is not displayed on the first screen, e.g. when the old position is
+" restored.
         function! s:SearchForDoNotEditHeader()
-            if search('\cdo not edit', 'n') == 0
-                    \ || expand('<afile>:t') =~# '^.\?vimrc$'
+            " Only search the first 20 lines to prevent false positives, e.g.
+            " in scripts which write files containing this warning and ignore
+            " the case (\c). (Can't use search()'s {stopline} as we might not
+            " start searching from the top.)
+            let l:match = search('\cdo not edit', 'n')
+            if l:match == 0 || l:match > 20
                 return
             endif
 
@@ -1010,6 +1012,10 @@ if has('autocmd')
 " the recommendation for git commit messages (http://tpope.net/node/106).
         autocmd FileType gitcommit let g:secure_modelines_allowed_items = [] |
                                  \ setlocal textwidth=72
+" Fix 'include' setting for shell files to recognize '.' and 'source'
+" commands. Use &l:include instead of setlocal which requires excessive
+" escaping of \.
+        autocmd FileType sh let &l:include = '^\s*\(\.\|source\)\s\+'
 " Use the same comment string as for Vim files in Vimperator files.
         autocmd FileType vimperator setlocal commentstring=\"%s
 " Use TeX compiler for (La)TeX files.