vim/bundle/xptemplate: Update to b531a310675959cd93a6968f2dbff97f4880be8c.

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index a7fa4d731c1ce8dd71b213f949603ed5b80e6118..6e5e78d91c1e055f3f55aa90498f9ff6564fdad9 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -543,6 +543,10 @@ if has('eval')
         \ :call <SID>TemporaryNostartofline("<Bslash><Lt>C-U>")<CR>
 endif
 
+" Let Y yank to the end of the line, similar to D and C. Use yy if you want to
+" yank a line. This fixes a weird inconsistency in Vi(m).
+nnoremap Y y$
+
 " Write before suspending, thanks to deryni in #vim on Freenode (2011-05-09
 " 20:02 CEST). To suspend without saving either unmap this or use :stop<CR>.
 " Only the current buffer is written, thus switching to another buffer works
@@ -618,11 +622,6 @@ else
     nmap <Leader>sd <Nop>
 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
-" on Freenode for an improved version which doesn't clobber any marks.
-nnoremap <silent> <Leader>; :call setline(line('.'), getline('.') . ';')<CR>
-
 if has('eval')
 " * and # for selections in visual mode. Thanks to
 " http://got-ravings.blogspot.com/2008/07/vim-pr0n-visual-search-mappings.html
@@ -984,16 +983,17 @@ if has('autocmd')
         endif
 
 " Display a warning when editing a file which contains "do not edit" (ignoring
-" 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.
+" the case) and similar messages 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()
             " 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')
+            let l:search = '\c\(do not \(edit\|modify\)\|autogenerated by\)'
+            let l:match = search(l:search, 'n')
             if l:match == 0 || l:match > 20
                 return
             endif