diff options
38 files changed, 773 insertions, 584 deletions
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index 350ae7e88f..ede536ed68 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1,4 +1,4 @@ -*autocmd.txt* For Vim version 8.0. Last change: 2018 Jan 31 +*autocmd.txt* For Vim version 8.0. Last change: 2018 Feb 09 VIM REFERENCE MANUAL by Bram Moolenaar @@ -33,7 +33,7 @@ files matching *.c. You can also use autocommands to implement advanced features, such as editing compressed files (see |gzip-example|). The usual place to put autocommands is in your .vimrc or .exrc file. - *E203* *E204* *E143* *E855* *E937* + *E203* *E204* *E143* *E855* *E937* *E952* WARNING: Using autocommands is very powerful, and may lead to unexpected side effects. Be careful not to destroy your text. - It's a good idea to do some testing on an expendable copy of a file first. diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 648e4e8c5a..1235edfa6e 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 8.0. Last change: 2018 Jan 28 +*eval.txt* For Vim version 8.0. Last change: 2018 Feb 09 VIM REFERENCE MANUAL by Bram Moolenaar @@ -5936,8 +5936,6 @@ matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]]) < Matches added by |matchaddpos()| are returned by |getmatches()| with an entry "pos1", "pos2", etc., with the value a list like the {pos} item. - These matches cannot be set via |setmatches()|, however they - can still be deleted by |clearmatches()|. matcharg({nr}) *matcharg()* Selects the {nr} match item, as set with a |:match|, diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt index da65681877..f124079174 100644 --- a/runtime/doc/filetype.txt +++ b/runtime/doc/filetype.txt @@ -1,4 +1,4 @@ -*filetype.txt* For Vim version 8.0. Last change: 2017 Dec 05 +*filetype.txt* For Vim version 8.0. Last change: 2018 Feb 04 VIM REFERENCE MANUAL by Bram Moolenaar @@ -602,51 +602,17 @@ MANPAGER *manpager.vim* The :Man command allows you to turn Vim into a manpager (that syntax highlights manpages and follows linked manpages on hitting CTRL-]). -Tested on: - - - Linux - - Mac OS - - FreeBSD - - OpenBSD - - Cygwin - - Win 10 under Bash - -Untested: - - - Amiga OS - - BeOS - - OS/2 - -If man sets the $MAN_PN environment variable, like man-db, the most common -implementation on Linux, then the "env MAN_PN=1 " part below should NOT be -set, that is, the "env MAN_PN=1" should be omitted! Otherwise, the Vim -manpager does not correctly recognize manpages whose title contains a capital -letter. See the discussion on - - https://groups.google.com/forum/#!topic/vim_dev/pWZmt_7GkxI - For bash,zsh,ksh or dash, add to the config file (.bashrc,.zshrc, ...) - export MANPAGER="env MAN_PN=1 vim -M +MANPAGER -" + export MANPAGER="vim -M +MANPAGER -" For (t)csh, add to the config file - setenv MANPAGER "env MAN_PN=1 vim -M +MANPAGER -" + setenv MANPAGER "vim -M +MANPAGER -" For fish, add to the config file - set -x MANPAGER "env MAN_PN=1 vim -M +MANPAGER -" - -On OpenBSD: - - export MANPAGER="env MAN_PN=1 vim -M +MANPAGER" - -If you experience still issues on manpages whose titles do not contain capital -letters, then try adding MANPATH=${MANPATH} after MAN_PN=1. If your manpages do -not show up localized, then try adding, LANGUAGE=${LANG} after MAN_PN=1. See - - https://github.com/vim/vim/issues/1002 - + set -x MANPAGER "vim -M +MANPAGER -" PDF *ft-pdf-plugin* @@ -669,7 +635,7 @@ By default the following options are set, in accordance with PEP8: > setlocal expandtab shiftwidth=4 softtabstop=4 tabstop=8 To disable this behaviour, set the following variable in your vimrc: > - + let g:python_recommended_style = 0 diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt index 6969c5db1a..50e93ba130 100644 --- a/runtime/doc/if_pyth.txt +++ b/runtime/doc/if_pyth.txt @@ -1,4 +1,4 @@ -*if_pyth.txt* For Vim version 8.0. Last change: 2018 Jan 28 +*if_pyth.txt* For Vim version 8.0. Last change: 2018 Jan 30 VIM REFERENCE MANUAL by Paul Moore @@ -823,14 +823,14 @@ To avoid loading the dynamic library, only check if Vim was compiled with python support: > if has('python_compiled') echo 'compiled with Python 2.x support' - if has('python_dynamic - echo 'Python 2.x dynamically loaded + if has('python_dynamic') + echo 'Python 2.x dynamically loaded' endif endif if has('python3_compiled') echo 'compiled with Python 3.x support' - if has('python3_dynamic - echo 'Python 3.x dynamically loaded + if has('python3_dynamic') + echo 'Python 3.x dynamically loaded' endif endif diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index 5bdcb9e769..4d51a84d2d 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -1,4 +1,4 @@ -*message.txt* For Vim version 8.0. Last change: 2017 Oct 14 +*message.txt* For Vim version 8.0. Last change: 2018 Feb 04 VIM REFERENCE MANUAL by Bram Moolenaar @@ -76,7 +76,7 @@ See `:messages` above. LIST OF MESSAGES *E222* *E228* *E232* *E256* *E293* *E298* *E304* *E317* *E318* *E356* *E438* *E439* *E440* *E316* *E320* *E322* - *E323* *E341* *E473* *E570* *E685* > + *E323* *E341* *E473* *E570* *E685* *E950* > Add to read buffer makemap: Illegal mode Cannot create BalloonEval with both message and callback @@ -97,6 +97,7 @@ LIST OF MESSAGES Internal error Internal error: {function} fatal error in cs_manage_matches + Invalid count for del_bytes(): {N} This is an internal error. If you can reproduce it, please send in a bug report. |bugs| diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index e584b3dbf5..87b7bbc500 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 8.0. Last change: 2017 Dec 21 +*options.txt* For Vim version 8.0. Last change: 2018 Feb 03 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index 89b24c6477..a4d0d2e507 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -1,4 +1,4 @@ -*pattern.txt* For Vim version 8.0. Last change: 2017 Jun 05 +*pattern.txt* For Vim version 8.0. Last change: 2018 Feb 04 VIM REFERENCE MANUAL by Bram Moolenaar @@ -905,7 +905,7 @@ $ At end of pattern or in front of "\|", "\)" or "\n" ('magic' on): becomes invalid. Vim doesn't automatically update the matches. Similar to moving the cursor for "\%#" |/\%#|. - */\%l* */\%>l* */\%<l* + */\%l* */\%>l* */\%<l* *E951* \%23l Matches in a specific line. \%<23l Matches above a specific line (lower line number). \%>23l Matches below a specific line (higher line number). diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index 516a1daf56..f97b0335bb 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1,4 +1,4 @@ -*quickref.txt* For Vim version 8.0. Last change: 2017 Nov 21 +*quickref.txt* For Vim version 8.0. Last change: 2018 Jan 31 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index 15187b61e1..c6e568a70f 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 8.0. Last change: 2018 Jan 27 +*starting.txt* For Vim version 8.0. Last change: 2018 Feb 09 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1010,14 +1010,13 @@ Vi compatible default value ~ When Vim starts, the 'compatible' option is on. This will be used when Vim starts its initializations. But as soon as: - a user vimrc file is found, or -- a vimrc file in the current directory, or +- a vimrc file in the current directoryis found, or - the "VIMINIT" environment variable is set, or - the "-N" command line argument is given, or - the "--clean" command line argument is given, or - even when no vimrc file exists. - the |defaults.vim| script is loaded, or -- gvimrc file was found, -then it will be set to 'nocompatible'. +- a gvimrc file was found, +then the option will be set to 'nocompatible'. Note that this does NOT happen when a system-wide vimrc file was found. diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 9f062fc6d4..04387f7d41 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 8.0. Last change: 2018 Jan 27 +*syntax.txt* For Vim version 8.0. Last change: 2018 Jan 31 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2779,13 +2779,10 @@ Ruby syntax will perform spellchecking of strings if you define SCHEME *scheme.vim* *ft-scheme-syntax* -By default only R5RS keywords are highlighted and properly indented. +By default only R7RS keywords are highlighted and properly indented. -MzScheme-specific stuff will be used if b:is_mzscheme or g:is_mzscheme -variables are defined. - -Also scheme.vim supports keywords of the Chicken Scheme->C compiler. Define -b:is_chicken or g:is_chicken, if you need them. +scheme.vim also supports extensions of the CHICKEN Scheme->C compiler. +Define b:is_chicken or g:is_chicken, if you need them. SDL *sdl.vim* *ft-sdl-syntax* diff --git a/runtime/doc/tags b/runtime/doc/tags index 112a0eaf13..83dd953cd2 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -785,7 +785,9 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX* 'pvh' options.txt /*'pvh'* 'pvw' options.txt /*'pvw'* 'pythondll' options.txt /*'pythondll'* +'pythonhome' options.txt /*'pythonhome'* 'pythonthreedll' options.txt /*'pythonthreedll'* +'pythonthreehome' options.txt /*'pythonthreehome'* 'pyx' options.txt /*'pyx'* 'pyxversion' options.txt /*'pyxversion'* 'qe' options.txt /*'qe'* @@ -3664,6 +3666,7 @@ Cmd-event autocmd.txt /*Cmd-event* CmdUndefined autocmd.txt /*CmdUndefined* Cmdline cmdline.txt /*Cmdline* Cmdline-mode cmdline.txt /*Cmdline-mode* +CmdlineChanged autocmd.txt /*CmdlineChanged* CmdlineEnter autocmd.txt /*CmdlineEnter* CmdlineLeave autocmd.txt /*CmdlineLeave* CmdwinEnter autocmd.txt /*CmdwinEnter* @@ -3688,6 +3691,7 @@ Dictionaries eval.txt /*Dictionaries* Dictionary eval.txt /*Dictionary* Dictionary-function eval.txt /*Dictionary-function* Digraphs digraph.txt /*Digraphs* +DirChanged autocmd.txt /*DirChanged* E motion.txt /*E* E10 message.txt /*E10* E100 diff.txt /*E100* @@ -4577,6 +4581,9 @@ E947 terminal.txt /*E947* E948 terminal.txt /*E948* E949 editing.txt /*E949* E95 message.txt /*E95* +E950 message.txt /*E950* +E951 pattern.txt /*E951* +E952 autocmd.txt /*E952* E96 diff.txt /*E96* E97 diff.txt /*E97* E98 diff.txt /*E98* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index b56221b0f0..27ee766516 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 8.0. Last change: 2018 Jan 28 +*todo.txt* For Vim version 8.0. Last change: 2018 Feb 09 VIM REFERENCE MANUAL by Bram Moolenaar @@ -54,6 +54,8 @@ Terminal emulator window: with the expected screenshot. Set t_Co to 256. +channel: +- get_job_options() isn't clear about what causes an error, often just returns + "invalid argument". - Add a separate timeout for opening a socket. Currently it's fixed at 50 msec, which is too small for a remote connection. (tverniquet, #2130) - Try out background make plugin: @@ -127,6 +129,8 @@ Regexp problems: Another one: echom matchstr(" sdfsfsf\n sfdsdfsdf",'[^\n]*') (2017 May 15, #1252) +Use vim_clear() in more places, instead of vim_free() and assigning NULL. + Include a few color schemes, based on popularity: http://www.vim.org/scripts/script_search_results.php?keywords=&script_type=color+scheme&order_by=rating&direction=descending&search=search http://vimawesome.com/?q=tag:color-scheme @@ -146,77 +150,23 @@ Include solarized color scheme?, it does not support termguicolors. Reproducible: invalid memory access in regexp with zero-width. reproduced by Dominique, 2017 Dec 23 - heap-use-after-free in win_equal_rec (#2467) - au* 0 vsĀ” - ar0 - arga - al - al -Patch to fix using freed memory. (Christian Brabandt, 2018 Jan 6, #2467) - -Patch for nsis runtime files. (Ken Takata, 2018 Jan 25) - -Patch for scheme runtime files (new version) (Evan Hanson, 2018 Jan 26) - -Patch to turn tests into new style. (Yegappan, 2017 Dec 29, #2509) - -Patch to fix crash in rubyf. (W, #2512) fixes #2511 - -Updates for Debian runtime files. (James McCoy, 2018 Jan 7) - -Crash when calling term_start() with empty command on windows. (Wang Shidong, -2018 Dec 27, #2501) - -Patch to improve DirectX rendering. (Ken Takata, 2018 Jan 18, #2560 fixes -#2401) - -Endless loop invovlving gui_mch_stop_blink(). (zdohnal, 2018 Jan 11) - -Patch to add 'pythonhome' and 'pythonthreehome' options. (Kazuki Sakamoto, -2016 Nov 21, #1266) "silent! try" doesn't restore emsg_silent when an exception is thrown. (Ben Reilly, 2018 Jan 5, #2531) Possible solution by Christian Brabandt, 2018 Jan 6. -Patch to fix ex mode buffering output. (Brian M. Carlson, 2018 Jan 8, #2537) - -Patch for config.vim syntax file. (James McCoy, 2018 Jan 28, maintainer didn't -respond). - -Patch to add support for clojure script filetype detection. (David Burgin, -2018 Jan 20, #257) - -Patch to implement the DirChanged autocmd event. (Andy Massimino, 2018 Jan 9, -replaces #888) - -Patch to fix not adding a slash after :find completion. (Genki Sky, 2018 Jan -10) - -Patch for man.vim, fix for Mac. (SungHyun Nam, 2018 Jan 8, #2488) -Update Jan 10. - -Patch to fix illegal memory access in del_bytes(). (Christian Brabandt, 2018 -Jan 2, #2466) - -Recursive use of alist_add() (Christian Brabandt, 2018 Jan 6, #2472) - -patch 1218 breaks etags. (zdohnal, 2018 Jan 5) +Mode message isn't updated on vertical split. (Alexei Averchenko, 2018 Feb 2, +#2611) Errors found with random data: heap-buffer-overflow in alist_add (#2472) - heap-buffer-overflow in del_bytes (#2466) Compiler warnings (geeknik, 2017 Oct 26): - signed integer overflow in do_sub() (#2249) - signed integer overflow in get_address() (#2248) - signed integer overflow in getdecchrs() (#2254) -- signed integer overflow in nfa_regatom() (#2251) - patch by Christian Brabandt, 2018 Jan 8 - undefined left shift in get_string_tv() (#2250) -Patch to fix CursorIM highlighting on Windows. (Ken Takata, 2018 Jan 18) - Cursor in wrong screen line with WinBar. (#2362) Fix by Christian Brabandt (2018 Jan 2) @@ -224,9 +174,9 @@ balloon_show() does not work properly in the terminal. (Ben Jackson, 2017 Dec 20, #2481) Also see #2352, want better control over balloon, perhaps set the position. -Patch to make installer faster. (Ken Takata, 2018 Jan 3, #2522) - Patch to support hunspell. (Matej Cepl, Jan 2018, #2500) +Patch to include hunspell support. (Matej Cepl, 2017 Dec 26, #845) +Doesn't work on Windows yet. Cursor in status line after search. (#2530) @@ -237,28 +187,33 @@ Alternative manpager.vim. (Enno, 2018 Jan 5, #2529) Patch for minimum width of completion popup menu. (Christian Brabandt, 2018 Jan 3, #2314) -When using :packadd files under "later" are not used, which is inconsistent -with packages under "start". (xtal8, #1994) +Patch to redraw instead of scroll for terminal window. (Ken Takata, #2010) -Patch to make D&D work between 32 bit app and 64 bit Vim. (Ken Takata, #2504) +Patch to add "user_data" to completion items. (Ben Jackson, 2018 Feb 1, #2608, +closes #2508) -Patch to fix invalid return value with backwards searchpair. (Daniel Hahler, -2018 Jan 15, #2552) +Patch to add TextChangedP, text changed while popup menu is visible. (Prabir +Shrestha, 2018 Jan 28, test added by Christian Brabandt) + +When using :packadd files under "later" are not used, which is inconsistent +with packages under "start". (xtal8, #1994) Column number is wrong whsn using 'linebreak' and 'wrap'. (Keith Smiley, 2018 Jan 15, #2555) -Patch to remove redundant "if". (Dominique Pelle, 2018 Jan 14) +Patch to add getjumplist(). (Yegappan Lakshmanan, 2018 Feb 2, #2609) Serbian translations. (Peseic, 2018 Jan 17) +Patch for problem with restoring screen on Windows. (Nobuhiro Takasaki, 2015 +Sep 10) Update 2018 Jan 4 #2575 +Alternate change by Ken Takata. + Check argument of systemlist(). (Pavlov) Patch to parse ":line" in tags file and use it for search. (Daniel Hahler, #2546) -Patch to fix illegal memory access. (Christian Brabandt, 2018 Jan 6, #2523) - When 'inchsearch' and 'hlsearch' are set /\v highlights everything. Also see #2337 @@ -282,10 +237,16 @@ ch_sendraw() with long string does not try to read inbetween, which may cause a deadlock if the reading side is waiting for the write to finish. (Nate Bosch, 2018 Jan 13, #2548) +User dictionary ~/.vim/spell/lang.utf-8.add not used for spell checking until a +word is re-added to it. (Matej Cepl, 2018 Feb 6) + Problem with mouse scroll in tmux. (fcying, #2419) Might be caused by patch -8.0.1309. +8.0.1309. Removing "held_button = MOUSE_RELEASE;" helps. (2018 Feb 5) + +Patch for 24 bit color support in MS-Windows console, using vcon. (Nobuhiro +Takasaki, Ken Takata, 2017 Oct 1, #2060). -Des setting 'cursorline' cause syntax highlighting to slow down? Perhaps is +Does setting 'cursorline' cause syntax highlighting to slow down? Perhaps is mess up the cache? (Mike Lee Williams, 2018 Jan 27, #2539) Fold at end of the buffer behaves inconsistently. (James McCoy, 2017 Oct 9) @@ -300,14 +261,11 @@ Using 'wildignore' also applies to literally entered file name. Also with directory (Paulo Marcel Coelho Arabic, 2017 Oct 30, #2266) Also see #1689. -Patch for 24 bit color support in MS-Windows console, using vcon. (Nobuhiro -Takasaki, Ken Takata, 2017 Oct 1, #2060). - ml_get error when using a Python. (Yggdroot, 2017 Jun 1, #1737) Lemonboy can reproduce (2017 Jun 5) When 'virtualedit' is "all" and 'cursorcolumn' is set, the wrong column may be -highlighted. (van-debugger, 2018 Jan 23, #2576) +highlighted. (van-de-bugger, 2018 Jan 23, #2576) Patch to add winlayout() function. (Yegappan Lakshmanan, 2018 Jan 4) @@ -372,6 +330,9 @@ always nested. matchit hasn't been maintained for a long time. #955. +Patch to add variable name after "scope add". (Eddie Lebow, 2018 Feb 7, #2620) +Maybe not needed? + Problem with 'delcombine'. (agguser, 2017 Nov 10, #2313) MS-Windows: buffer completion doesn't work when using backslash (or slash) @@ -416,9 +377,6 @@ It can replace the BeOS code, which is likely not used anymore. Now on github: #1856. Updated Oct 2017 Got permission to include this under the Vim license. -Patch to include hunspell support. (Matej Cepl, 2017 Dec 26, #845) -Doesn't work on Windows yet. - Refactored HTML indent file. (Michael Lee, #1821) Test_writefile_fails_conversion failure on Solaris because if different iconv @@ -1072,10 +1030,6 @@ Update Aug 14. When using --remote-tab on MS-Windows 'encoding' hasn't been initialized yet, the file name ends up encoded wrong. (Raul Coronado, 2015 Dec 21) -Patch for problem with restoring screen on Windows. (Nobuhiro Takasaki, 2015 -Sep 10) Update 2018 Jan 4 #2575 -Alternate change by Ken Takata. - Example in editing.txt uses $HOME with the expectation that it ends in a slash. For me it does, but perhaps not for everybody. Add a function that inserts a slash when needed? pathconcat(dir, path) (Thilo Six, 2015 Aug 12) @@ -1122,9 +1076,6 @@ Doesn't work completely (Dominique Orban) Patch to add a "literal" argument to bufnr(). (Olaf Dabrunz, 2015 Aug 4) -Cannot execute the shell when it's in a directory with a space. -Issue #459. - When a session file is created and there are "nofile" buffers, these are not filled. Need to trigger BufReadCmd autocommands. Also handle deleting the initial empty buffer better. (ZyX, 2015 March 8) @@ -4623,8 +4574,6 @@ Autocommands: Error - When an error happens NormalEnter - Entering Normal mode ReplaceEnter - Entering Replace mode - CmdEnter - Entering Cmdline mode (with type of cmdline to allow - different mapping) VisualEnter - Entering Visual mode *Leave - Leaving a mode (in pair with the above *Enter) VimLeaveCheck - Before Vim decides to exit, so that it can be cancelled diff --git a/runtime/ftplugin/chicken.vim b/runtime/ftplugin/chicken.vim new file mode 100644 index 0000000000..8daa04c774 --- /dev/null +++ b/runtime/ftplugin/chicken.vim @@ -0,0 +1,51 @@ +" CHICKEN-specific Vim customizations +" Last Change: 2018-01-06 +" Author: Evan Hanson <evhan@foldling.org> +" Maintainer: Evan Hanson <evhan@foldling.org> +" URL: https://foldling.org/vim/ftplugin/chicken.vim +" Notes: These are supplemental settings, to be loaded after the core +" Scheme ftplugin file (ftplugin/scheme.vim). Enable it by setting +" b:is_chicken=1 and filetype=scheme. + +if !exists('b:did_scheme_ftplugin') + finish +endif + +setl keywordprg=chicken-doc + +setl lispwords+=and-let* +setl lispwords+=begin-for-syntax +setl lispwords+=compiler-typecase +setl lispwords+=condition-case +setl lispwords+=define-compiler-syntax +setl lispwords+=define-constant +setl lispwords+=define-external +setl lispwords+=define-for-syntax +setl lispwords+=define-inline +setl lispwords+=define-record +setl lispwords+=define-record-printer +setl lispwords+=define-specialization +setl lispwords+=define-syntax-rule +setl lispwords+=eval-when +setl lispwords+=fluid-let +setl lispwords+=handle-exceptions +setl lispwords+=let-compiler-syntax +setl lispwords+=let-optionals +setl lispwords+=let-optionals* +setl lispwords+=letrec-values +setl lispwords+=match +setl lispwords+=match-lambda +setl lispwords+=match-lambda* +setl lispwords+=match-let +setl lispwords+=match-let* +setl lispwords+=module +setl lispwords+=receive +setl lispwords+=select +setl lispwords+=set!-values + +let b:undo_ftplugin = b:undo_ftplugin . ' keywordprg<' + +if exists('g:loaded_matchit') && !exists('b:match_words') + let b:match_words = '#>:<#' + let b:undo_ftplugin = b:undo_ftplugin . ' | unlet! b:match_words' +endif diff --git a/runtime/ftplugin/debchangelog.vim b/runtime/ftplugin/debchangelog.vim index d2718db88e..32f683109d 100644 --- a/runtime/ftplugin/debchangelog.vim +++ b/runtime/ftplugin/debchangelog.vim @@ -1,11 +1,11 @@ " Vim filetype plugin file (GUI menu, folding and completion) " Language: Debian Changelog -" Maintainer: Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org> +" Maintainer: Debian Vim Maintainers " Former Maintainers: Michael Piefel <piefel@informatik.hu-berlin.de> " Stefano Zacchiroli <zack@debian.org> -" Last Change: 2014-01-31 +" Last Change: 2018-01-06 " License: Vim License -" URL: http://hg.debian.org/hg/pkg-vim/vim/file/unstable/runtime/ftplugin/debchangelog.vim +" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/ftplugin/debchangelog.vim " Bug completion requires apt-listbugs installed for Debian packages or " python-launchpadlib installed for Ubuntu packages diff --git a/runtime/ftplugin/debcontrol.vim b/runtime/ftplugin/debcontrol.vim index 7871d9897f..9643d16c28 100644 --- a/runtime/ftplugin/debcontrol.vim +++ b/runtime/ftplugin/debcontrol.vim @@ -1,9 +1,9 @@ " Vim filetype plugin file (GUI menu and folding) " Language: Debian control files -" Maintainer: Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org> +" Maintainer: Debian Vim Maintainers " Former Maintainer: Pierre Habouzit <madcoder@debian.org> -" Last Change: 2008-03-08 -" URL: http://hg.debian.org/hg/pkg-vim/vim/raw-file/tip/runtime/ftplugin/debcontrol.vim +" Last Change: 2018-01-06 +" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/ftplugin/debcontrol.vim " Do these settings once per buffer if exists("b:did_ftplugin") diff --git a/runtime/ftplugin/scheme.vim b/runtime/ftplugin/scheme.vim index ab1543a5ee..b7f8e8bbe7 100644 --- a/runtime/ftplugin/scheme.vim +++ b/runtime/ftplugin/scheme.vim @@ -1,45 +1,62 @@ -" Vim filetype plugin -" Language: Scheme -" Maintainer: Sergey Khorev <sergey.khorev@gmail.com> -" URL: http://sites.google.com/site/khorser/opensource/vim -" Original author: Dorai Sitaram <ds26@gte.com> -" Original URL: http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html -" Last Change: Oct 23, 2013 - -" Only do this when not done yet for this buffer -if exists("b:did_ftplugin") +" Vim filetype plugin file +" Language: Scheme (R7RS) +" Last Change: 2018-01-20 +" Author: Evan Hanson <evhan@foldling.org> +" Maintainer: Evan Hanson <evhan@foldling.org> +" Previous Maintainer: Sergey Khorev <sergey.khorev@gmail.com> +" URL: https://foldling.org/vim/ftplugin/scheme.vim + +if exists('b:did_ftplugin') finish endif -" Don't load another plugin for this buffer -let b:did_ftplugin = 1 +let s:cpo = &cpo +set cpo&vim -" Copy-paste from ftplugin/lisp.vim -setl comments=:; -setl define=^\\s*(def\\k* -setl formatoptions-=t -setl iskeyword+=+,-,*,/,%,<,=,>,:,$,?,!,@-@,94 setl lisp +setl comments=:;;;;,:;;;,:;;,:;,sr:#\|,ex:\|# setl commentstring=;%s +setl define=^\\s*(def\\k* +setl iskeyword=33,35-39,42-43,45-58,60-90,94,95,97-122,126 -setl comments^=:;;;,:;;,sr:#\|,mb:\|,ex:\|# +let b:undo_ftplugin = 'setl lisp< comments< commentstring< define< iskeyword<' -" Scheme-specific settings -if exists("b:is_mzscheme") || exists("is_mzscheme") - " improve indenting - setl iskeyword+=#,%,^ - setl lispwords+=module,parameterize,let-values,let*-values,letrec-values - setl lispwords+=define-values,opt-lambda,case-lambda,syntax-rules,with-syntax,syntax-case - setl lispwords+=define-signature,unit,unit/sig,compund-unit/sig,define-values/invoke-unit/sig -endif +setl lispwords=begin +setl lispwords+=case +setl lispwords+=case-lambda +setl lispwords+=cond +setl lispwords+=cond-expand +setl lispwords+=define +setl lispwords+=define-record-type +setl lispwords+=define-syntax +setl lispwords+=define-values +setl lispwords+=do +setl lispwords+=guard +setl lispwords+=import +setl lispwords+=lambda +setl lispwords+=let +setl lispwords+=let* +setl lispwords+=let*-values +setl lispwords+=let-syntax +setl lispwords+=let-values +setl lispwords+=letrec +setl lispwords+=letrec* +setl lispwords+=letrec-syntax +setl lispwords+=parameterize +setl lispwords+= |