From 47b4eb110da8dfab1fca51ce4cc68b224d85b966 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Thu, 1 Aug 2019 16:45:37 +0200 Subject: vim-patch:4c92e75dd4dd Update runtime files. https://github.com/vim/vim/commit/4c92e75dd4ddb68dd92a86dd02d53c70dd4af33a vim-patch:c854898881c0 Revert change accidentally included in runtime file updates. Closes vim/vim#3998. https://github.com/vim/vim/commit/c854898881c02259f90170f210bf65bbd20cc1fc --- runtime/ftplugin/8th.vim | 25 +++++++++++++++++++++++++ runtime/ftplugin/rst.vim | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 runtime/ftplugin/8th.vim (limited to 'runtime/ftplugin') diff --git a/runtime/ftplugin/8th.vim b/runtime/ftplugin/8th.vim new file mode 100644 index 0000000000..14301187d6 --- /dev/null +++ b/runtime/ftplugin/8th.vim @@ -0,0 +1,25 @@ +" Vim ftplugin file +" Language: 8th +" Version: any +" Last Change: 2015/11/08 +" Maintainer: Ron Aaron +" URL: https://8th-dev.com/ +" Filetypes: *.8th +" NOTE: 8th allows any non-whitespace in a name, so you need to do: +" setlocal iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255 +" This goes with the syntax/8th.vim file. + +" Only do this when not done yet for this buffer +if exists("b:did_8thplugin") + finish +endif + +" Don't load another plugin for this buffer +let b:did_8thplugin = 1 + +setlocal ts=2 sts=2 sw=2 et +setlocal com=s1:/*,mb:*,ex:*/,:\|,:\\ +setlocal fo=tcrqol +setlocal matchpairs+=\::; +setlocal iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255 +setlocal suffixesadd=.8th diff --git a/runtime/ftplugin/rst.vim b/runtime/ftplugin/rst.vim index 8ab56b052a..f0646e9f36 100644 --- a/runtime/ftplugin/rst.vim +++ b/runtime/ftplugin/rst.vim @@ -30,7 +30,7 @@ setlocal formatoptions+=tcroql " " More sophisticated indentation rules should be revisted in the future. -if !exists("g:rst_style") || g:rst_style != 0 +if exists("g:rst_style") && g:rst_style != 0 setlocal expandtab shiftwidth=3 softtabstop=3 tabstop=8 endif -- cgit From 2cdbbe50a4a695004adce50d7502869bb2410928 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Thu, 1 Aug 2019 22:45:59 +0200 Subject: vim-patch:63b74a8362b1 Update runtime files. https://github.com/vim/vim/commit/63b74a8362b14576b21d342dc424d0396ca8ea27 --- runtime/ftplugin/cobol.vim | 5 +- runtime/ftplugin/python.vim | 133 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 106 insertions(+), 32 deletions(-) (limited to 'runtime/ftplugin') diff --git a/runtime/ftplugin/cobol.vim b/runtime/ftplugin/cobol.vim index 11ad3ad727..d96a1bf281 100644 --- a/runtime/ftplugin/cobol.vim +++ b/runtime/ftplugin/cobol.vim @@ -1,7 +1,8 @@ " Vim filetype plugin file " Language: cobol -" Author: Tim Pope -" Last Update: By ZyX: use shiftwidth() +" Maintainer: Ankit Jain +" (formerly Tim Pope ) +" Last Update: By Ankit Jain (changed maintainer) on 22.03.2019 " Insert mode mappings: " Normal mode mappings: < > << >> [[ ]] [] ][ diff --git a/runtime/ftplugin/python.vim b/runtime/ftplugin/python.vim index 5c4a59b1a9..64c1a87a69 100644 --- a/runtime/ftplugin/python.vim +++ b/runtime/ftplugin/python.vim @@ -3,7 +3,7 @@ " Maintainer: Tom Picton " Previous Maintainer: James Sully " Previous Maintainer: Johannes Zellner -" Last Change: Sun, 15 April 2018 +" Last Change: Sun 17 Mar 2019 " https://github.com/tpict/vim-ftplugin-python if exists("b:did_ftplugin") | finish | endif @@ -37,9 +37,10 @@ setlocal suffixesadd=.py setlocal comments=b:#,fb:- setlocal commentstring=#\ %s -setlocal omnifunc=pythoncomplete#Complete if has('python3') - setlocal omnifunc=python3complete#Complete + setlocal omnifunc=python3complete#Complete +elseif has('python') + setlocal omnifunc=pythoncomplete#Complete endif set wildignore+=*.pyc @@ -53,32 +54,34 @@ let b:prev='\v^\s*(class\|def\|async def)>' let b:next_end='\v\S\n*(%$\|^(\s*\n*)*(class\|def\|async def)\|^\S)' let b:prev_end='\v\S\n*(^(\s*\n*)*(class\|def\|async def)\|^\S)' -execute "nnoremap ]] :call Python_jump('n', '". b:next_toplevel."', 'W', v:count1)" -execute "nnoremap [[ :call Python_jump('n', '". b:prev_toplevel."', 'Wb', v:count1)" -execute "nnoremap ][ :call Python_jump('n', '". b:next_endtoplevel."', 'W', 0, v:count1)" -execute "nnoremap [] :call Python_jump('n', '". b:prev_endtoplevel."', 'Wb', 0, v:count1)" -execute "nnoremap ]m :call Python_jump('n', '". b:next."', 'W', v:count1)" -execute "nnoremap [m :call Python_jump('n', '". b:prev."', 'Wb', v:count1)" -execute "nnoremap ]M :call Python_jump('n', '". b:next_end."', 'W', 0, v:count1)" -execute "nnoremap [M :call Python_jump('n', '". b:prev_end."', 'Wb', 0, v:count1)" - -execute "onoremap ]] :call Python_jump('o', '". b:next_toplevel."', 'W', v:count1)" -execute "onoremap [[ :call Python_jump('o', '". b:prev_toplevel."', 'Wb', v:count1)" -execute "onoremap ][ :call Python_jump('o', '". b:next_endtoplevel."', 'W', 0, v:count1)" -execute "onoremap [] :call Python_jump('o', '". b:prev_endtoplevel."', 'Wb', 0, v:count1)" -execute "onoremap ]m :call Python_jump('o', '". b:next."', 'W', v:count1)" -execute "onoremap [m :call Python_jump('o', '". b:prev."', 'Wb', v:count1)" -execute "onoremap ]M :call Python_jump('o', '". b:next_end."', 'W', 0, v:count1)" -execute "onoremap [M :call Python_jump('o', '". b:prev_end."', 'Wb', 0, v:count1)" - -execute "xnoremap ]] :call Python_jump('x', '". b:next_toplevel."', 'W', v:count1)" -execute "xnoremap [[ :call Python_jump('x', '". b:prev_toplevel."', 'Wb', v:count1)" -execute "xnoremap ][ :call Python_jump('x', '". b:next_endtoplevel."', 'W', 0, v:count1)" -execute "xnoremap [] :call Python_jump('x', '". b:prev_endtoplevel."', 'Wb', 0, v:count1)" -execute "xnoremap ]m :call Python_jump('x', '". b:next."', 'W', v:count1)" -execute "xnoremap [m :call Python_jump('x', '". b:prev."', 'Wb', v:count1)" -execute "xnoremap ]M :call Python_jump('x', '". b:next_end."', 'W', 0, v:count1)" -execute "xnoremap [M :call Python_jump('x', '". b:prev_end."', 'Wb', 0, v:count1)" +if !exists('g:no_plugin_maps') && !exists('g:no_python_maps') + execute "nnoremap ]] :call Python_jump('n', '". b:next_toplevel."', 'W', v:count1)" + execute "nnoremap [[ :call Python_jump('n', '". b:prev_toplevel."', 'Wb', v:count1)" + execute "nnoremap ][ :call Python_jump('n', '". b:next_endtoplevel."', 'W', v:count1, 0)" + execute "nnoremap [] :call Python_jump('n', '". b:prev_endtoplevel."', 'Wb', v:count1, 0)" + execute "nnoremap ]m :call Python_jump('n', '". b:next."', 'W', v:count1)" + execute "nnoremap [m :call Python_jump('n', '". b:prev."', 'Wb', v:count1)" + execute "nnoremap ]M :call Python_jump('n', '". b:next_end."', 'W', v:count1, 0)" + execute "nnoremap [M :call Python_jump('n', '". b:prev_end."', 'Wb', v:count1, 0)" + + execute "onoremap ]] :call Python_jump('o', '". b:next_toplevel."', 'W', v:count1)" + execute "onoremap [[ :call Python_jump('o', '". b:prev_toplevel."', 'Wb', v:count1)" + execute "onoremap ][ :call Python_jump('o', '". b:next_endtoplevel."', 'W', v:count1, 0)" + execute "onoremap [] :call Python_jump('o', '". b:prev_endtoplevel."', 'Wb', v:count1, 0)" + execute "onoremap ]m :call Python_jump('o', '". b:next."', 'W', v:count1)" + execute "onoremap [m :call Python_jump('o', '". b:prev."', 'Wb', v:count1)" + execute "onoremap ]M :call Python_jump('o', '". b:next_end."', 'W', v:count1, 0)" + execute "onoremap [M :call Python_jump('o', '". b:prev_end."', 'Wb', v:count1, 0)" + + execute "xnoremap ]] :call Python_jump('x', '". b:next_toplevel."', 'W', v:count1)" + execute "xnoremap [[ :call Python_jump('x', '". b:prev_toplevel."', 'Wb', v:count1)" + execute "xnoremap ][ :call Python_jump('x', '". b:next_endtoplevel."', 'W', v:count1, 0)" + execute "xnoremap [] :call Python_jump('x', '". b:prev_endtoplevel."', 'Wb', v:count1, 0)" + execute "xnoremap ]m :call Python_jump('x', '". b:next."', 'W', v:count1)" + execute "xnoremap [m :call Python_jump('x', '". b:prev."', 'Wb', v:count1)" + execute "xnoremap ]M :call Python_jump('x', '". b:next_end."', 'W', v:count1, 0)" + execute "xnoremap [M :call Python_jump('x', '". b:prev_end."', 'Wb', v:count1, 0)" +endif if !exists('*Python_jump') fun! Python_jump(mode, motion, flags, count, ...) range @@ -123,10 +126,80 @@ if !exists('g:pydoc_executable') let g:pydoc_executable = 0 endif endif + +" Windows-specific pydoc setup +if has('win32') || has('win64') + if executable('python') + " available as Tools\scripts\pydoc.py + let g:pydoc_executable = 1 + else + let g:pydoc_executable = 0 + endif +endif + " If "pydoc" was found use it for keywordprg. if g:pydoc_executable - setlocal keywordprg=pydoc + if has('win32') || has('win64') + setlocal keywordprg=python\ -m\ pydoc\ + else + setlocal keywordprg=pydoc + endif endif +" Script for filetype switching to undo the local stuff we may have changed +let b:undo_ftplugin = 'setlocal cinkeys<' + \ . '|setlocal comments<' + \ . '|setlocal commentstring<' + \ . '|setlocal expandtab<' + \ . '|setlocal include<' + \ . '|setlocal includeexpr<' + \ . '|setlocal indentkeys<' + \ . '|setlocal keywordprg<' + \ . '|setlocal omnifunc<' + \ . '|setlocal shiftwidth<' + \ . '|setlocal softtabstop<' + \ . '|setlocal suffixesadd<' + \ . '|setlocal tabstop<' + \ . '|silent! nunmap [M' + \ . '|silent! nunmap [[' + \ . '|silent! nunmap []' + \ . '|silent! nunmap [m' + \ . '|silent! nunmap ]M' + \ . '|silent! nunmap ][' + \ . '|silent! nunmap ]]' + \ . '|silent! nunmap ]m' + \ . '|silent! ounmap [M' + \ . '|silent! ounmap [[' + \ . '|silent! ounmap []' + \ . '|silent! ounmap [m' + \ . '|silent! ounmap ]M' + \ . '|silent! ounmap ][' + \ . '|silent! ounmap ]]' + \ . '|silent! ounmap ]m' + \ . '|silent! xunmap [M' + \ . '|silent! xunmap [[' + \ . '|silent! xunmap []' + \ . '|silent! xunmap [m' + \ . '|silent! xunmap ]M' + \ . '|silent! xunmap ][' + \ . '|silent! xunmap ]]' + \ . '|silent! xunmap ]m' + \ . '|unlet! b:browsefilter' + \ . '|unlet! b:child_match' + \ . '|unlet! b:child_sub' + \ . '|unlet! b:grandparent_match' + \ . '|unlet! b:grandparent_sub' + \ . '|unlet! b:next' + \ . '|unlet! b:next_end' + \ . '|unlet! b:next_endtoplevel' + \ . '|unlet! b:next_toplevel' + \ . '|unlet! b:parent_match' + \ . '|unlet! b:parent_sub' + \ . '|unlet! b:prev' + \ . '|unlet! b:prev_end' + \ . '|unlet! b:prev_endtoplevel' + \ . '|unlet! b:prev_toplevel' + \ . '|unlet! b:undo_ftplugin' + let &cpo = s:keepcpo unlet s:keepcpo -- cgit From 31a5ec23ebef511ca89f7d24077e7a5624ed4c6e Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Thu, 1 Aug 2019 22:48:52 +0200 Subject: vim-patch:723dd946f948 Update runtime files. https://github.com/vim/vim/commit/723dd946f94856be94a943876945fb1bd8169059 --- runtime/ftplugin/make.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'runtime/ftplugin') diff --git a/runtime/ftplugin/make.vim b/runtime/ftplugin/make.vim index fb180c0e5f..bfa8703082 100644 --- a/runtime/ftplugin/make.vim +++ b/runtime/ftplugin/make.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: Make " Maintainer: Bram Moolenaar -" Last Change: 2013 Apr 22 +" Last Change: 2019 Apr 02 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -27,7 +27,7 @@ setlocal commentstring=#\ %s " Including files. let &l:include = '^\s*include' -" For matchit.vim, suggested by Albert Netymk. +" For matchit.vim, suggested by Albert Netymk and Ken Takata. if exists("loaded_matchit") - let b:match_words = '\:\:\,\:\' + let b:match_words = '^ *ifn\=\(eq\|def\)\>:^ *else\(\s\+ifn\=\(eq\|def\)\)\=\>:^ *endif\>,\:\,^!\s*if\(n\=def\)\=\>:^!\s*else\(if\(n\=def\)\=\)\=\>:^!\s*endif\>' endif -- cgit From f379eac1ef9926ecefab7302f876c7c93b5cca74 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Thu, 1 Aug 2019 22:59:21 +0200 Subject: vim-patch:911ead126903 Update runtime files https://github.com/vim/vim/commit/911ead126903aeb9564bad89e46a147ed4959896 NA: vim-patch:602abeb20fb7 --- runtime/ftplugin/dosbatch.vim | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'runtime/ftplugin') diff --git a/runtime/ftplugin/dosbatch.vim b/runtime/ftplugin/dosbatch.vim index dbc02d80f8..070bdc4ba2 100644 --- a/runtime/ftplugin/dosbatch.vim +++ b/runtime/ftplugin/dosbatch.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: MS-DOS .bat files " Maintainer: Mike Williams -" Last Change: 8th May 2012 +" Last Change: 14th April 2019 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -16,6 +16,7 @@ set cpo&vim " BAT comment formatting setlocal comments=b:rem,b:@rem,b:REM,b:@REM,::: +setlocal commentstring=::\ %s setlocal formatoptions-=t formatoptions+=rol " Define patterns for the browse file filter -- cgit From 532ee54a42a294073e8b441f3ce5a050d16963a2 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Thu, 1 Aug 2019 23:21:22 +0200 Subject: vim-patch:a6c27c47ddf0 Update runtime files https://github.com/vim/vim/commit/a6c27c47ddf081859659d7de1caec675147e466b --- runtime/ftplugin/nroff.vim | 11 +++++++++++ runtime/ftplugin/ocaml.vim | 4 ++-- runtime/ftplugin/sql.vim | 6 +++--- 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 runtime/ftplugin/nroff.vim (limited to 'runtime/ftplugin') diff --git a/runtime/ftplugin/nroff.vim b/runtime/ftplugin/nroff.vim new file mode 100644 index 0000000000..069c02e59a --- /dev/null +++ b/runtime/ftplugin/nroff.vim @@ -0,0 +1,11 @@ +" Vim filetype plugin +" Language: roff(7) +" Maintainer: Chris Spiegel +" Last Change: 2019 Apr 24 + +if exists("b:did_ftplugin") + finish +endif +let b:did_ftplugin = 1 + +setlocal commentstring=.\\\"%s diff --git a/runtime/ftplugin/ocaml.vim b/runtime/ftplugin/ocaml.vim index e0d7efe997..d9336421cf 100644 --- a/runtime/ftplugin/ocaml.vim +++ b/runtime/ftplugin/ocaml.vim @@ -392,8 +392,8 @@ endfunction endfun " This variable contain a dictionnary of list. Each element of the dictionnary - " represent an annotation system. An annotation system is a list with : - " - annotation file name as it's key + " represent an annotation system. An annotation system is a list with: + " - annotation file name as its key " - annotation file path as first element of the contained list " - build path as second element of the contained list " - annot_file_last_mod (contain the date of .annot file) as third element diff --git a/runtime/ftplugin/sql.vim b/runtime/ftplugin/sql.vim index 4d6fcd9564..1c02a98c7c 100644 --- a/runtime/ftplugin/sql.vim +++ b/runtime/ftplugin/sql.vim @@ -400,7 +400,7 @@ endif " Predefined SQL objects what are used by the below mappings using " the ]} style maps. -" This global variable allows the users to override it's value +" This global variable allows the users to override its value " from within their vimrc. " Note, you cannot use \?, since these patterns can be used to search " backwards, you must use \{,1} @@ -486,10 +486,10 @@ if exists('&omnifunc') " OMNI function prior to setting up the SQL OMNI function let b:sql_compl_savefunc = &omnifunc - " Source it to determine it's version + " Source it to determine its version runtime autoload/sqlcomplete.vim " This is used by the sqlcomplete.vim plugin - " Source it for it's global functions + " Source it for its global functions runtime autoload/syntaxcomplete.vim setlocal omnifunc=sqlcomplete#Complete -- cgit