From c535cc7dde493f405d81cfb9d331405d9b0f097a Mon Sep 17 00:00:00 2001 From: KillTheMule Date: Tue, 3 May 2016 20:58:32 +0200 Subject: vim-patch:d7464be Updated runtime files. https://github.com/vim/vim/commit/d7464be9747fcaa8e6210e1f00a3882932df76e2 Applied cleanly except for runtime/docs/todo.txt and runtime/docs/tags. --- runtime/ftplugin/hog.vim | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 runtime/ftplugin/hog.vim (limited to 'runtime/ftplugin') diff --git a/runtime/ftplugin/hog.vim b/runtime/ftplugin/hog.vim new file mode 100644 index 0000000000..4ee0a9f934 --- /dev/null +++ b/runtime/ftplugin/hog.vim @@ -0,0 +1,39 @@ +" Vim filetype plugin +" Language: hog (snort.conf) +" Maintainer: . Victor Roemer, . +" Last Change: Mar 1, 2013 + +if exists("b:did_ftplugin") + finish +endif +let b:did_ftplugin = 1 + +let s:undo_ftplugin = "setl fo< com< cms< def< inc<" + +let s:cpo_save = &cpo +set cpo&vim + +setlocal formatoptions=croq +setlocal comments=:# +setlocal commentstring=\c#\ %s +setlocal define=\c^\s\{-}var +setlocal include=\c^\s\{-}include + +" Move around configurations +let s:hog_keyword_match = '\c^\s*\<\(preprocessor\\|config\\|output\\|include\\|ipvar\\|portvar\\|var\\|dynamicpreprocessor\\|' . + \ 'dynamicengine\\|dynamicdetection\\|activate\\|alert\\|drop\\|block\\|dynamic\\|log\\|pass\\|reject\\|sdrop\\|sblock\)\>' + +exec "nnoremap ]] :call search('" . s:hog_keyword_match . "', 'W' )" +exec "nnoremap [[ :call search('" . s:hog_keyword_match . "', 'bW' )" + +if exists("loaded_matchit") + let b:match_words = + \ '^\s*\<\%(preprocessor\|config\|output\|include\|ipvar\|portvar' . + \ '\|var\|dynamicpreprocessor\|dynamicengine\|dynamicdetection' . + \ '\|activate\|alert\|drop\|block\|dynamic\|log\|pass\|reject' . + \ '\|sdrop\|sblock\>\):$,\::\,:;' + let b:match_skip = 'r:\\.\{-}$\|^\s*#.\{-}$\|^\s*$' +endif + +let &cpo = s:cpo_save +unlet s:cpo_save -- cgit From 9d1c52239a949adc681614e8ad8ec194d9a85408 Mon Sep 17 00:00:00 2001 From: KillTheMule Date: Tue, 3 May 2016 21:10:30 +0200 Subject: vim-patch:d042dc8 Update runtime files. https://github.com/vim/vim/commit/d042dc825c9b97dacd84d4728f88300da4d5b6b9 Missing in runtime/doc: hangulin.txt, tags, todo.txt. The changes to options.txt do not apply for nvim. man.vim is very different in nvim, some changes applied manually, others discarded. --- runtime/ftplugin/changelog.vim | 12 +++++++----- runtime/ftplugin/man.vim | 4 ++++ 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'runtime/ftplugin') diff --git a/runtime/ftplugin/changelog.vim b/runtime/ftplugin/changelog.vim index 244245e271..257e9cd9d4 100644 --- a/runtime/ftplugin/changelog.vim +++ b/runtime/ftplugin/changelog.vim @@ -1,7 +1,8 @@ " Vim filetype plugin file -" Language: generic Changelog file -" Maintainer: Nikolai Weibull -" Latest Revision: 2014-01-10 +" Language: generic Changelog file +" Maintainer: Martin Florian +" Previous Maintainer: Nikolai Weibull +" Latest Revision: 2015-10-25 " Variables: " g:changelog_timeformat (deprecated: use g:changelog_dateformat instead) - " description: the timeformat used in ChangeLog entries. @@ -167,7 +168,7 @@ if &filetype == 'changelog' let cursor = stridx(line, '{cursor}') call setline(lnum, substitute(line, '{cursor}', '', '')) endif - startinsert! + startinsert endfunction " Internal function to create a new entry in the ChangeLog. @@ -223,7 +224,8 @@ if &filetype == 'changelog' endfunction if exists(":NewChangelogEntry") != 2 - noremap o :call new_changelog_entry('') + nnoremap o :call new_changelog_entry('') + xnoremap o :call new_changelog_entry('') command! -nargs=0 NewChangelogEntry call s:new_changelog_entry('') endif diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim index 36cd70f203..04ab539fb1 100644 --- a/runtime/ftplugin/man.vim +++ b/runtime/ftplugin/man.vim @@ -32,6 +32,10 @@ if !exists("g:no_plugin_maps") && !exists("g:no_man_maps") endif endif +if exists('g:ft_man_folding_enable') && (g:ft_man_folding_enable == 1) + setlocal foldmethod=indent foldnestmax=1 foldenable +endif + let b:undo_ftplugin = 'setlocal iskeyword<' " vim: set sw=2: -- cgit From 7b29dfc43a0220cfc20d657e68eeddaa0d1d3674 Mon Sep 17 00:00:00 2001 From: KillTheMule Date: Tue, 3 May 2016 21:16:53 +0200 Subject: vim-patch:256972a Updated runtime files. https://github.com/vim/vim/commit/256972a9849b5d575b62a6a71be5b6934b5b0e8b Missing files in runtime/doc: todo.txt, tags. Patch to runtime/doc/syntax.txt was applied manually in part, for no discernible reason. --- runtime/ftplugin/fortran.vim | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'runtime/ftplugin') diff --git a/runtime/ftplugin/fortran.vim b/runtime/ftplugin/fortran.vim index 7591edd821..5d42409fd4 100644 --- a/runtime/ftplugin/fortran.vim +++ b/runtime/ftplugin/fortran.vim @@ -1,9 +1,9 @@ " Vim settings file " Language: Fortran 2008 (and older: Fortran 2003, 95, 90, 77, 66) -" Version: 0.49 -" Last Change: 2013 Oct. 01 +" Version: 0.50 +" Last Change: 2015 Nov. 30 " Maintainer: Ajit J. Thakkar ; -" Usage: Do :help fortran-plugin from Vim +" Usage: For instructions, do :help fortran-plugin from Vim " Credits: " Useful suggestions were made by Stefano Zacchiroli, Hendrik Merx, Ben " Fritz, and David Barnett. @@ -20,7 +20,10 @@ set cpoptions&vim let b:did_ftplugin = 1 " Determine whether this is a fixed or free format source file -" if this hasn't been done yet +" if this hasn't been done yet using the priority: +" buffer-local value +" > global value +" > file extension as in Intel ifort, gcc (gfortran), NAG, Pathscale, and Cray compilers if !exists("b:fortran_fixed_source") if exists("fortran_free_source") " User guarantees free source form @@ -28,13 +31,19 @@ if !exists("b:fortran_fixed_source") elseif exists("fortran_fixed_source") " User guarantees fixed source form let b:fortran_fixed_source = 1 + elseif expand("%:e") ==? "f\<90\|95\|03\|08\>" + " Free-form file extension defaults as in Intel ifort, gcc(gfortran), NAG, Pathscale, and Cray compilers + let b:fortran_fixed_source = 0 + elseif expand("%:e") ==? "f\|f77\|for" + " Fixed-form file extension defaults + let b:fortran_fixed_source = 1 else - " Modern Fortran allows both fixed and free source form - " assume fixed source form unless signs of free source form - " are detected in the first five columns of the first s:lmax lines + " Modern fortran still allows both fixed and free source form + " Assume fixed source form unless signs of free source form + " are detected in the first five columns of the first s:lmax lines. " Detection becomes more accurate and time-consuming if more lines " are checked. Increase the limit below if you keep lots of comments at - " the very top of each file and you have a fast computer + " the very top of each file and you have a fast computer. let s:lmax = 500 if ( s:lmax > line("$") ) let s:lmax = line("$") -- cgit