# HG changeset patch # User Bram Moolenaar # Date 1603743307 -3600 # Node ID 5b7ea82bc18fab6f2dbea1c7286cae29d6fae216 # Parent 41cc1c207f82038435deff3e2798f04ce6e301d0 Update runtime files. Commit: https://github.com/vim/vim/commit/cb80aa2d53e56d3aba3b3c439fb467f29a750c5e Author: Bram Moolenaar Date: Mon Oct 26 21:12:46 2020 +0100 Update runtime files. diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim --- a/runtime/autoload/zip.vim +++ b/runtime/autoload/zip.vim @@ -1,7 +1,7 @@ " zip.vim: Handles browsing zipfiles " AUTOLOAD PORTION " Date: Jan 07, 2020 -" Version: 30 +" Version: 31 " Maintainer: Charles E Campbell " License: Vim License (see vim's :help license) " Copyright: Copyright (C) 2005-2019 Charles E. Campbell {{{1 @@ -20,7 +20,7 @@ if &cp || exists("g:loaded_zip") finish endif -let g:loaded_zip= "v30" +let g:loaded_zip= "v31" if v:version < 702 echohl WarningMsg echo "***warning*** this version of zip needs vim 7.2 or later" @@ -65,7 +65,7 @@ endif " zip#Browse: {{{2 fun! zip#Browse(zipfile) " call Dfunc("zip#Browse(zipfile<".a:zipfile.">)") - " sanity check: ensure that the zipfile has "PK" as its first two letters + " sanity check: insure that the zipfile has "PK" as its first two letters " (zipped files have a leading PK as a "magic cookie") if !filereadable(a:zipfile) || readfile(a:zipfile, "", 1)[0] !~ '^PK' exe "noswapfile noautocmd noswapfile e ".fnameescape(a:zipfile) diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1,4 +1,4 @@ -*autocmd.txt* For Vim version 8.2. Last change: 2020 Sep 25 +*autocmd.txt* For Vim version 8.2. Last change: 2020 Oct 26 VIM REFERENCE MANUAL by Bram Moolenaar @@ -278,7 +278,7 @@ Name triggered by ~ |BufWinLeave| before a buffer is removed from a window |BufUnload| before unloading a buffer -|BufHidden| just after a buffer has become hidden +|BufHidden| just before a buffer becomes hidden |BufNew| just after creating a new buffer |SwapExists| detected an existing swap file @@ -883,7 +883,7 @@ InsertEnter Just before starting Inser string. *InsertLeavePre* InsertLeavePre Just before leaving Insert mode. Also when - using CTRL-O |i_CTRL-O|. Be caseful not to + using CTRL-O |i_CTRL-O|. Be careful not to change mode or use `:normal`, it will likely cause trouble. *InsertLeave* diff --git a/runtime/doc/channel.txt b/runtime/doc/channel.txt --- a/runtime/doc/channel.txt +++ b/runtime/doc/channel.txt @@ -1,4 +1,4 @@ -*channel.txt* For Vim version 8.2. Last change: 2020 Sep 03 +*channel.txt* For Vim version 8.2. Last change: 2020 Oct 17 VIM REFERENCE MANUAL by Bram Moolenaar @@ -965,6 +965,10 @@ job_status({job}) *job_status()* *E9 "fail", because a fork happens before the failure can be detected. + If in Vim9 script a variable is declared with type "job" but + never assigned to, passing that variable to job_status() + returns "fail". + If an exit callback was set with the "exit_cb" option and the job is now detected to be "dead" the callback will be invoked. @@ -1288,7 +1292,7 @@ prompt. > " Send the text to a shell with Enter appended. call ch_sendraw(g:shell_job, a:text .. "\n") endfunc - + " Function handling output from the shell: Added above the prompt. func GotOutput(channel, msg) call append(line("$") - 1, "- " . a:msg) diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1,4 +1,4 @@ -*editing.txt* For Vim version 8.2. Last change: 2020 Aug 17 +*editing.txt* For Vim version 8.2. Last change: 2020 Oct 23 VIM REFERENCE MANUAL by Bram Moolenaar @@ -73,10 +73,14 @@ g CTRL-G Prints the current position of ways: Column, Line, Word, Character and Byte. If the number of Characters and Bytes is the same then the Character position is omitted. + If there are characters in the line that take more than one position on the screen ( or special - character), both the "real" column and the screen - column are shown, separated with a dash. + character), or characters using more than one byte per + column (characters above 0x7F when 'encoding' is + utf-8), both the byte column and the screen column are + shown, separated by a dash. + Also see the 'ruler' option and the |wordcount()| function. diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 8.2. Last change: 2020 Oct 05 +*eval.txt* For Vim version 8.2. Last change: 2020 Oct 23 VIM REFERENCE MANUAL by Bram Moolenaar @@ -120,7 +120,7 @@ base, use |str2nr()|. *TRUE* *FALSE* *Boolean* For boolean operators Numbers are used. Zero is FALSE, non-zero is TRUE. -You can also use |v:false| and |v:true|. In Vim9 script |false| and |true|. +You can also use |v:false| and |v:true|. In Vim9 script |false| and |true|. When TRUE is returned from a function it is the Number one, FALSE is the number zero. @@ -2746,7 +2746,7 @@ prop_type_change({name}, {props}) none change an existing property type prop_type_delete({name} [, {props}]) none delete a property type -prop_type_get([{name} [, {props}]]) +prop_type_get({name} [, {props}]) Dict get property type values prop_type_list([{props}]) List get list of property types pum_getpos() Dict position and size of pum if visible @@ -3126,7 +3126,7 @@ appendbufline({expr}, {lnum}, {text}) error message is given. Example: > :let failed = appendbufline(13, 0, "# THE START") < -< Can also be used as a |method| after a List, the base is + Can also be used as a |method| after a List, the base is passed as the second argument: > mylist->appendbufline(buf, lnum) @@ -7972,8 +7972,8 @@ printf({fmt}, {expr1} ...) *printf()* prompt_getprompt({buf}) *prompt_getprompt()* - Returns the effective prompt text for buffer {buf}. {buf} can - be a buffer name or number. |prompt-buffer|. + Returns the effective prompt text for buffer {buf}. {buf} can + be a buffer name or number. See |prompt-buffer|. If the buffer doesn't exist or isn't a prompt buffer, an empty string is returned. @@ -10709,8 +10709,8 @@ terminalprops() *terminalprops()* detected from the response to |t_RV| request. See |v:termresponse| for the response itself. If |v:termresponse| is empty most values here will be 'u' for unknown. - cursor_style wether sending |t_RS| works ** - cursor_blink_mode wether sending |t_RC| works ** + cursor_style whether sending |t_RS| works ** + cursor_blink_mode whether sending |t_RC| works ** underline_rgb whether |t_8u| works ** mouse mouse type supported @@ -11366,7 +11366,8 @@ winsaveview() Returns a |Dictionary| tha curswant column for vertical movement topline first line in the window topfill filler lines, only in diff mode - leftcol first column displayed + leftcol first column displayed; only used when + 'wrap' is off skipcol columns skipped Note that no option values are saved. @@ -12140,8 +12141,9 @@ be used to pass settings to the autoload Note that when you make a mistake and call a function that is supposed to be defined in an autoload script, but the script doesn't actually define the -function, the script will be sourced every time you try to call the function. -And you will get an error message every time. +function, you will get an error message for the missing function. If you fix +the autoload script it won't be automatically loaded again. Either restart +Vim or manually source the script. Also note that if you have two script files, and one calls a function in the other and vice versa, before the used function is defined, it won't work. diff --git a/runtime/doc/if_mzsch.txt b/runtime/doc/if_mzsch.txt --- a/runtime/doc/if_mzsch.txt +++ b/runtime/doc/if_mzsch.txt @@ -1,4 +1,4 @@ -*if_mzsch.txt* For Vim version 8.2. Last change: 2019 Dec 07 +*if_mzsch.txt* For Vim version 8.2. Last change: 2020 Oct 14 VIM REFERENCE MANUAL by Sergey Khorev @@ -43,7 +43,7 @@ 1. Commands *mzscheme-commands* {script} {endmarker} Execute inlined MzScheme script {script}. - Note: This command doesn't work if the MzScheme + Note: This command doesn't work when the MzScheme feature wasn't compiled in. To avoid errors, see |script-here|. diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 8.2. Last change: 2020 Sep 19 +*insert.txt* For Vim version 8.2. Last change: 2020 Oct 16 VIM REFERENCE MANUAL by Bram Moolenaar @@ -312,6 +312,7 @@ If you enter a value of 10, it will end the buffer to a file, the character is translated into . The character is written at the end of each line. Thus if you want to insert a character in a file you will have to make a line break. +Also see 'fileformat'. *i_CTRL-X* *insert_expand* CTRL-X enters a sub-mode where several commands can be used. Most of these diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -1,4 +1,4 @@ -*motion.txt* For Vim version 8.2. Last change: 2020 Aug 24 +*motion.txt* For Vim version 8.2. Last change: 2020 Oct 18 VIM REFERENCE MANUAL by Bram Moolenaar @@ -190,11 +190,14 @@ 0 To the first character of the line. *^* ^ To the first non-blank character of the line. - |exclusive| motion. + |exclusive| motion. Any count is ignored. *$* ** ** $ or To the end of the line. When a count is given also go - [count - 1] lines downward. |inclusive| motion. + [count - 1] lines downward, or as far is possible. + |inclusive| motion. If a count of 2 of larger is + given and the cursor is on the last line, that is an + error an the cursor doesn't move. In Visual mode the cursor goes to just after the last character in the line. When 'virtualedit' is active, "$" may move the cursor diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt --- a/runtime/doc/pi_zip.txt +++ b/runtime/doc/pi_zip.txt @@ -154,4 +154,4 @@ 4. History *zip-history* {{{1 v1 Sep 15, 2005 * Initial release, had browsing, reading, and writing ============================================================================== -vim:tw=78:ts=8:noet:ft=help:fdm=marker +vim:tw=78:ts=8:ft=help:noet:norl:fdm=marker diff --git a/runtime/doc/popup.txt b/runtime/doc/popup.txt --- a/runtime/doc/popup.txt +++ b/runtime/doc/popup.txt @@ -1,4 +1,4 @@ -*popup.txt* For Vim version 8.2. Last change: 2020 Sep 28 +*popup.txt* For Vim version 8.2. Last change: 2020 Oct 17 VIM REFERENCE MANUAL by Bram Moolenaar @@ -314,6 +314,7 @@ popup_filter_menu({id}, {key}) *popup accept current selection x Esc CTRL-C cancel the menu Other keys are ignored. + Always returns |v:true|. A match is set on that line to highlight it, see |popup_menu()|. diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt --- a/runtime/doc/tabpage.txt +++ b/runtime/doc/tabpage.txt @@ -1,4 +1,4 @@ -*tabpage.txt* For Vim version 8.2. Last change: 2020 Aug 10 +*tabpage.txt* For Vim version 8.2. Last change: 2020 Oct 14 VIM REFERENCE MANUAL by Bram Moolenaar @@ -195,8 +195,8 @@ gt *i_CTRL-* *i_* *CTRL-W_g* ** + *g* *CTRL-W_g* ** g Go to the last accessed tab page. Other commands: @@ -259,7 +259,7 @@ REORDERING TAB PAGES: :tabmove " move the tab page to the last :$tabmove " as above :tabmove $ " as above - :tabmove # " move the tab page after the last accessed + :tabmove # " move the tab page after the last accessed " tab page :tabm[ove] +[N] diff --git a/runtime/doc/tags b/runtime/doc/tags --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -4378,7 +4378,6 @@ E538 options.txt /*E538* E539 options.txt /*E539* E54 pattern.txt /*E54* E540 options.txt /*E540* -E541 options.txt /*E541* E542 options.txt /*E542* E543 options.txt /*E543* E544 options.txt /*E544* @@ -4932,6 +4931,7 @@ InsertChange autocmd.txt /*InsertChange* InsertCharPre autocmd.txt /*InsertCharPre* InsertEnter autocmd.txt /*InsertEnter* InsertLeave autocmd.txt /*InsertLeave* +InsertLeavePre autocmd.txt /*InsertLeavePre* Integer eval.txt /*Integer* J change.txt /*J* Japanese mbyte.txt /*Japanese* diff --git a/runtime/doc/textprop.txt b/runtime/doc/textprop.txt --- a/runtime/doc/textprop.txt +++ b/runtime/doc/textprop.txt @@ -1,4 +1,4 @@ -*textprop.txt* For Vim version 8.2. Last change: 2020 Mar 05 +*textprop.txt* For Vim version 8.2. Last change: 2020 Oct 14 VIM REFERENCE MANUAL by Bram Moolenaar @@ -101,7 +101,7 @@ Manipulating text property types: prop_type_add({name}, {props}) define a new property type prop_type_change({name}, {props}) change an existing property type prop_type_delete({name} [, {props}]) delete a property type -prop_type_get([{name} [, {props}]]) get property type values +prop_type_get({name} [, {props}]) get property type values prop_type_list([{props}]) get list of property types @@ -291,7 +291,7 @@ prop_type_delete({name} [, {props}]) * Can also be used as a |method|: > GetPropName()->prop_type_delete() -prop_type_get([{name} [, {props}]]) *prop_type_get()* +prop_type_get({name} [, {props}]) *prop_type_get()* Returns the properties of property type {name}. This is a dictionary with the same fields as was given to prop_type_add(). diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 8.2. Last change: 2020 Oct 10 +*todo.txt* For Vim version 8.2. Last change: 2020 Oct 26 VIM REFERENCE MANUAL by Bram Moolenaar @@ -38,29 +38,13 @@ browser use: https://github.com/vim/vim/ *known-bugs* -------------------- Known bugs and current work ----------------------- +Sign highlight in signcolumn disappears if there is line highlighting. + Making everything work: -- If a function is defined in a block it may need to keep the block-locals, - like a compiled closure. -- Fix memory leaks in test_vim9_assign, remove "if 0" -- Fix memory leaks in test_vim9_script +- Test all command modifiers. +- Check many more builtin function arguments at compile time. - Closure arguments should be more strict, like any function call? -- Remove v:disallow_let -- Recognize call to assert_fails() and execute it in the function context? - Won't work if the command itself fails, not an expression failure: - assert_fails("unknown", "E99:") - Use try/catch is complicated: - let did_catch = false - try - unknown - catch - assert_caught('E99:') - did_catch = true - endtry - assert_true('did_catch') - Add a new command perhaps: - assertfail - unknown - endassertfail E99:.*unknown +- Invoke user command in a :def function - Make map() give an error if the resulting type is wrong. Add mapnew() or mapcopy() to create a new List/Dict for the result, which can have a different value type. @@ -124,12 +108,12 @@ Making everything work: - Make "++nr" work. - Make closures work: - Create closure in a loop. Need to make a list of them. + - nested closure only uses one context, not all (#7150) - expandcmd() with `=expr` in filename uses legacy expression. - eval_expr() in ex_cexpr() - eval_expr() call in dbg_parsearg() and debuggy_find() - has() is compiled as a constant, but some checks are dynamic. Check for dynamic values, such as "gui_running". -- Implement command modifiers, such as "silent". (#6530) New syntax and functionality: Improve error checking: - "echo Func()" is an error if Func() does not return anything. @@ -302,6 +286,8 @@ with 'termguicolors'. #1740 Patch for blockwise paste reporting changes: #6660. +Missing filetype test for bashrc, PKGBUILD, etc. + Add an option to not fetch terminal codes in xterm, to avoid flicker when t_Co changes. @@ -351,8 +337,6 @@ work. Using "au!" after "filetype on" is a bit slow. Can the matching of autocommands be made faster? (#7056) -Valgrind warns for uninitialized values in f_term_dumpwrite(). - Add the <=> (spaceship) operator and "cond ?< expr ?= expr ?> expr" replace this: let left = GetLeftFunc() @@ -455,7 +439,6 @@ Patch to fix session file when using mul May 20) Also put :argadd commands at the start for all buffers, so that their order remains equal? Then %argdel to clean it up. Do try this with 'hidden' set. -Also #4994: window-local options not always restored, related to using :badd. Also #5326: netrw buffers are not restored. Alternate file is not set in the session file. Use setwintabvar("@#") ? @@ -595,10 +578,6 @@ Patch to have text objects defined by ar Thau, 2013 Nov 20, 2014 Jan 29, 2014 Jan 31) Added tests (James McCoy, 2016 Aug 3, #958). Still needs more work. -":2resize +10" uses size of the current window, adds 10 and applies it to -window 2. User expects 10 to be added to size of window 2. (Daniel Steinberg, -#5443) - Would be nice to set tab-local values for 'diffexpr' and 'diffopt'. Use t:diffexpr_option t:diffopt_option? (#4782) @@ -3858,10 +3837,6 @@ 8 When dragging status line with mouse on the status line (caused by 'winheight'). Select window on button up, instead of on button down. 8 Dragging the status line doesn't scroll but redraw. -9 Evaluating 'statusline' in build_stl_str_hl() does not properly check for - reaching the end of the available buffer. - Patch to dynamically allocate the buffer for % items. (Eric Arnold, 2006 - May 14) 8 When performing incremental search, should abort searching as soon as a character is typed. 8 When the value of $MAKE contains a path, configure can't handle this. diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt --- a/runtime/doc/undo.txt +++ b/runtime/doc/undo.txt @@ -1,4 +1,4 @@ -*undo.txt* For Vim version 8.2. Last change: 2019 Dec 07 +*undo.txt* For Vim version 8.2. Last change: 2020 Oct 18 VIM REFERENCE MANUAL by Bram Moolenaar @@ -392,7 +392,7 @@ back the text of three deletes ago with *redo-register* If you want to get back more than one part of deleted text, you can use a special feature of the repeat command ".". It will increase the number of the -register used. So if you first do ""1P", the following "." will result in a +register used. So if you first do '"1P', the following "." will result in a '"2P'. Repeating this will result in all numbered registers being inserted. Example: If you deleted text with 'dd....' it can be restored with diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt --- a/runtime/doc/usr_11.txt +++ b/runtime/doc/usr_11.txt @@ -1,4 +1,4 @@ -*usr_11.txt* For Vim version 8.2. Last change: 2020 Jul 08 +*usr_11.txt* For Vim version 8.2. Last change: 2020 Oct 25 VIM USER MANUAL - by Bram Moolenaar @@ -294,7 +294,7 @@ If you really don't want to see this mes 'shortmess' option. But it's very unusual that you need this. For remarks about encryption and the swap file, see |:recover-crypt|. -For programatic access to the swap file, see |swapinfo()|. +For programmatic access to the swap file, see |swapinfo()|. ============================================================================== *11.4* Further reading diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 8.2. Last change: 2020 Aug 15 +*version7.txt* For Vim version 8.2. Last change: 2020 Oct 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -10260,7 +10260,7 @@ Commands: Brabandt) Other: - Lua interface now also uses userdata binded to Vim structures. (Taro + Lua interface now also uses userdata bound to Vim structures. (Taro Muraoka, Luis Carvalho) glob() and autocommand patterns used to work with the undocumented diff --git a/runtime/doc/version8.txt b/runtime/doc/version8.txt --- a/runtime/doc/version8.txt +++ b/runtime/doc/version8.txt @@ -1,4 +1,4 @@ -*version8.txt* For Vim version 8.2. Last change: 2020 Aug 15 +*version8.txt* For Vim version 8.2. Last change: 2020 Oct 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -47698,7 +47698,7 @@ Files: src/eval.c, src/testdir/test Patch 8.2.1064 Problem: Vim9: no line break allowed before comparators. -Solution: Check for comperator after line break. +Solution: Check for comparator after line break. Files: src/eval.c, src/testdir/test_vim9_expr.vim Patch 8.2.1065 diff --git a/runtime/doc/vim9.txt b/runtime/doc/vim9.txt --- a/runtime/doc/vim9.txt +++ b/runtime/doc/vim9.txt @@ -1,4 +1,4 @@ -*vim9.txt* For Vim version 8.2. Last change: 2020 Oct 05 +*vim9.txt* For Vim version 8.2. Last change: 2020 Oct 17 VIM REFERENCE MANUAL by Bram Moolenaar @@ -176,8 +176,8 @@ However, it is recommended to always use for clarity. In all cases the function must be defined before used. That is when it is -called, when `:defcompile` causes the it to be compiled, or when code that -calls it is being compiled (to figure out the return type). +called, when `:defcompile` causes it to be compiled, or when code that calls +it is being compiled (to figure out the return type). The result is that functions and variables without a namespace can usually be found in the script, either defined there or imported. Global functions and @@ -901,7 +901,7 @@ The script name after `import` can be: location of the script file itself. This is useful to split up a large plugin into several files. - An absolute path, starting with "/" on Unix or "D:/" on MS-Windows. This - will be rarely used. + will rarely be used. - A path not being relative or absolute. This will be found in the "import" subdirectories of 'runtimepath' entries. The name will usually be longer and unique, to avoid loading the wrong file. @@ -1160,8 +1160,8 @@ Some details are unexpected and can be i condition would accept a string, convert it to a number and check if the number is non-zero. This is unexpected and often leads to mistakes, since text not starting with a number would be converted to zero, which is -considered false. Thus a string would not give an error and be considered -false if it doesn't start with a number. That is confusing. +considered false. Thus using a string for a condition would often not give an +error and be considered false. That is confusing. In Vim9 type checking is more strict to avoid mistakes. Where a condition is used, e.g. with the `:if` command and the `||` operator, only boolean-like @@ -1169,7 +1169,7 @@ values are accepted: true: `true`, `v:true`, `1`, `0 < 9` false: `false`, `v:false`, `0`, `0 > 9` Note that the number zero is false and the number one is true. This is more -persmissive than most other languages. It was done because many builtin +permissive than most other languages. It was done because many builtin functions return these values. If you have any type of value and want to use it as a boolean, use the `!!` diff --git a/runtime/filetype.vim b/runtime/filetype.vim --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar -" Last Change: 2020 Sep 30 +" Last Change: 2020 Oct 24 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -1506,9 +1506,10 @@ au BufNewFile,BufRead *.decl,*.dcl,*.dec au BufNewFile,BufRead catalog setf catalog " Shell scripts (sh, ksh, bash, bash2, csh); Allow .profile_foo etc. -" Gentoo ebuilds and Arch Linux PKGBUILDs are actually bash scripts +" Gentoo ebuilds, Arch Linux PKGBUILDs and Alpine Linux APKBUILDs are actually +" bash scripts. " NOTE: Patterns ending in a star are further down, these have lower priority. -au BufNewFile,BufRead .bashrc,bashrc,bash.bashrc,.bash[_-]profile,.bash[_-]logout,.bash[_-]aliases,bash-fc[-.],*.bash,*/{,.}bash[_-]completion{,.d,.sh}{,/*},*.ebuild,*.eclass,PKGBUILD call dist#ft#SetFileTypeSH("bash") +au BufNewFile,BufRead .bashrc,bashrc,bash.bashrc,.bash[_-]profile,.bash[_-]logout,.bash[_-]aliases,bash-fc[-.],*.bash,*/{,.}bash[_-]completion{,.d,.sh}{,/*},*.ebuild,*.eclass,PKGBUILD,APKBUILD call dist#ft#SetFileTypeSH("bash") au BufNewFile,BufRead .kshrc,*.ksh call dist#ft#SetFileTypeSH("ksh") au BufNewFile,BufRead */etc/profile,.profile,*.sh,*.env call dist#ft#SetFileTypeSH(getline(1)) @@ -2163,7 +2164,7 @@ au BufNewFile,BufRead .reminders* call au BufNewFile,BufRead sgml.catalog* call s:StarSetf('catalog') " Shell scripts ending in a star -au BufNewFile,BufRead .bashrc*,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,bash-fc[-.]*,,PKGBUILD* call dist#ft#SetFileTypeSH("bash") +au BufNewFile,BufRead .bashrc*,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,bash-fc[-.]*,PKGBUILD*,APKBUILD* call dist#ft#SetFileTypeSH("bash") au BufNewFile,BufRead .kshrc* call dist#ft#SetFileTypeSH("ksh") au BufNewFile,BufRead .profile* call dist#ft#SetFileTypeSH(getline(1)) diff --git a/runtime/ftplugin/erlang.vim b/runtime/ftplugin/erlang.vim --- a/runtime/ftplugin/erlang.vim +++ b/runtime/ftplugin/erlang.vim @@ -1,7 +1,7 @@ " Vim ftplugin file " Language: Erlang -" Author: Oscar Hellstrm -" Contributors: Ricardo Catalinas Jimnez +" Author: Oscar Hellström +" Contributors: Ricardo Catalinas Jiménez " Eduardo Lopez (http://github.com/tapichu) " License: Vim license " Version: 2012/01/25 diff --git a/runtime/ftplugin/make.vim b/runtime/ftplugin/make.vim --- 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: 2019 Apr 02 +" Last Change: 2020 Oct 16 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -9,10 +9,10 @@ if exists("b:did_ftplugin") endif let b:did_ftplugin = 1 -let b:undo_ftplugin = "setl et< sts< fo< com< cms< inc<" +let b:undo_ftplugin = "setl et< sts< sw< fo< com< cms< inc<" " Make sure a hard tab is used, required for most make programs -setlocal noexpandtab softtabstop=0 +setlocal noexpandtab softtabstop=0 shiftwidth=0 " Set 'formatoptions' to break comment lines but not other lines, " and insert the comment leader when hitting or using "o". diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim --- a/runtime/ftplugin/man.vim +++ b/runtime/ftplugin/man.vim @@ -2,7 +2,7 @@ " Language: man " Maintainer: Jason Franklin " Maintainer: SungHyun Nam -" Last Change: 2020 Jun 01 +" Last Change: 2020 Oct 09 " To make the ":Man" command available before editing a manual page, source " this script from your startup vimrc file. @@ -76,7 +76,7 @@ catch /E145:/ " Ignore the error in restricted mode endtry -func PreGetPage(cnt) +func s:PreGetPage(cnt) if a:cnt == 0 let old_isk = &iskeyword if &ft == 'man' @@ -99,24 +99,27 @@ func PreGetPage(cnt) call s:GetPage('', sect, page) endfunc -func GetCmdArg(sect, page) - if a:sect == '' - return a:page +func s:GetCmdArg(sect, page) + + if empty(a:sect) + return shellescape(a:page) endif - return s:man_sect_arg.' '.a:sect.' '.a:page + + return s:man_sect_arg . ' ' . shellescape(a:sect) . ' ' . shellescape(a:page) endfunc -func FindPage(sect, page) - let where = system("man ".s:man_find_arg.' '.s:GetCmdArg(a:sect, a:page)) - if where !~ "^/" - if matchstr(where, " [^ ]*$") !~ "^ /" - return 0 - endif +func s:FindPage(sect, page) + let l:cmd = printf('man %s %s', s:man_find_arg, s:GetCmdArg(a:sect, a:page)) + call system(l:cmd) + + if v:shell_error + return 0 endif + return 1 endfunc -func GetPage(cmdmods, ...) +func s:GetPage(cmdmods, ...) if a:0 >= 2 let sect = a:1 let page = a:2 @@ -226,7 +229,7 @@ func GetPage(cmdmods, ...) setl noma endfunc -func PopPage() +func s:PopPage() if s:man_tag_depth > 0 let s:man_tag_depth = s:man_tag_depth - 1 exec "let s:man_tag_buf=s:man_tag_buf_".s:man_tag_depth diff --git a/runtime/ftplugin/rpl.vim b/runtime/ftplugin/rpl.vim --- a/runtime/ftplugin/rpl.vim +++ b/runtime/ftplugin/rpl.vim @@ -1,6 +1,6 @@ " Vim filetype plugin file " Language: RPL/2 -" Maintainer: Jol BERTRAND +" Maintainer: Joël BERTRAND " Last Change: 2012 Mar 07 " Version: 0.1 diff --git a/runtime/indent/rpl.vim b/runtime/indent/rpl.vim --- a/runtime/indent/rpl.vim +++ b/runtime/indent/rpl.vim @@ -2,7 +2,7 @@ " Language: RPL/2 " Version: 0.2 " Last Change: 2017 Jun 13 -" Maintainer: BERTRAND Jol +" Maintainer: BERTRAND Joël " Only load this indent file when no other was loaded. if exists("b:did_indent") diff --git a/runtime/indent/tilde.vim b/runtime/indent/tilde.vim --- a/runtime/indent/tilde.vim +++ b/runtime/indent/tilde.vim @@ -1,5 +1,5 @@ "Description: Indent scheme for the tilde weblanguage -"Author: Tobias Rundstrm +"Author: Tobias Rundström "URL: http://tilde.tildesoftware.net "Last Change: May 8 09:15:09 CEST 2002 diff --git a/runtime/optwin.vim b/runtime/optwin.vim --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -1,7 +1,7 @@ " These commands create the option window. " " Maintainer: Bram Moolenaar -" Last Change: 2020 Sep 10 +" Last Change: 2020 Oct 23 " If there already is an option window, jump to that one. let buf = bufnr('option-window') @@ -617,7 +617,7 @@ call AddOption("mousemodel", gettex call OptionG("mousem", &mousem) call AddOption("mousetime", gettext("maximum time in msec to recognize a double-click")) call append("$", " \tset mouset=" . &mouset) -call AddOption("ttymouse", gettext("\"xterm\", \"xterm2\", \"dec\" or \"netterm\"; type of mouse")) +call AddOption("ttymouse", gettext("\"xterm\", \"xterm2\", \"sgr\", etc.; type of mouse")) call OptionG("ttym", &ttym) if has("mouseshape") call AddOption("mouseshape", gettext("what the mouse pointer looks like in different modes")) @@ -689,10 +689,6 @@ if has("gui") call append("$", " \tset bexpr=" . &bexpr) endif endif - if exists("+macatsui") - call AddOption("macatsui", gettext("use ATSUI text drawing; disable to avoid display problems")) - call OptionG("macatsui", &macatsui) - endif endif if has("printer") @@ -791,7 +787,7 @@ call BinOptionL("mod") call AddOption("readonly", gettext("buffer is not to be written")) call append("$", "\t" .. s:local_to_buffer) call BinOptionL("ro") -call AddOption("modifiable", gettext("changes to the text are not possible")) +call AddOption("modifiable", gettext("changes to the text are possible")) call append("$", "\t" .. s:local_to_buffer) call BinOptionL("ma") call AddOption("textwidth", gettext("line length above which to break a line")) @@ -852,7 +848,7 @@ if has("digraphs") endif call AddOption("tildeop", gettext("the \"~\" command behaves like an operator")) call BinOptionG("top", &top) -call AddOption("operatorfunc", gettext("function called for the\"g@\" operator")) +call AddOption("operatorfunc", gettext("function called for the \"g@\" operator")) call OptionG("opfunc", &opfunc) call AddOption("showmatch", gettext("when inserting a bracket, briefly jump to its match")) call BinOptionG("sm", &sm) @@ -863,7 +859,7 @@ call append("$", "\t" .. s:local_to_buff call OptionL("mps") call AddOption("joinspaces", gettext("use two spaces after '.' when joining a line")) call BinOptionG("js", &js) -call AddOption("nrformats", gettext("\"alpha\", \"octal\" and/or \"hex\"; number formats recognized for\nCTRL-A and CTRL-X commands")) +call AddOption("nrformats", gettext("\"alpha\", \"octal\", \"hex\", \"bin\" and/or \"unsigned\"; number formats\nrecognized for CTRL-A and CTRL-X commands")) call append("$", "\t" .. s:local_to_buffer) call OptionL("nf") @@ -938,7 +934,7 @@ endif if has("folding") call Header(gettext("folding")) - call AddOption("foldenable", gettext("set to display all folds open")) + call AddOption("foldenable", gettext("unset to display all folds open")) call append("$", "\t" .. s:local_to_window) call BinOptionL("fen") call AddOption("foldlevel", gettext("folds with a level higher than this number will be closed")) @@ -961,7 +957,7 @@ if has("folding") call OptionL("fml") call AddOption("commentstring", gettext("template for comments; used to put the marker in")) call OptionL("cms") - call AddOption("foldmethod", gettext("folding type: \"manual\", \"indent\", \"expr\", \"marker\" or \"syntax\"")) + call AddOption("foldmethod", gettext("folding type: \"manual\", \"indent\", \"expr\", \"marker\",\n\"syntax\" or \"diff\"")) call append("$", "\t" .. s:local_to_window) call OptionL("fdm") call AddOption("foldexpr", gettext("expression used when 'foldmethod' is \"expr\"")) @@ -1069,7 +1065,7 @@ call BinOptionG("fs", &fs) call AddOption("shortname", gettext("use 8.3 file names")) call append("$", "\t" .. s:local_to_buffer) call BinOptionL("sn") -call AddOption("cryptmethod", gettext("encryption method for file writing: zip or blowfish")) +call AddOption("cryptmethod", gettext("encryption method for file writing: zip, blowfish or blowfish2")) call append("$", "\t" .. s:local_to_buffer) call OptionL("cm") @@ -1093,7 +1089,7 @@ call append("$", " \tset mmt=" . &mmt) call Header(gettext("command line editing")) -call AddOption("history", gettext("how many command lines are remembered ")) +call AddOption("history", gettext("how many command lines are remembered")) call append("$", " \tset hi=" . &hi) call AddOption("wildchar", gettext("key that triggers command-line expansion")) call append("$", " \tset wc=" . &wc) @@ -1187,19 +1183,12 @@ if has("quickfix") endif -if has("win32") || has("osfiletype") +if has("win32") call Header(gettext("system specific")) - if has("osfiletype") - call AddOption("osfiletype", gettext("OS-specific information about the type of file")) - call append("$", "\t" .. s:local_to_buffer) - call OptionL("oft") - endif - if has("win32") - call AddOption("shellslash", gettext("use forward slashes in file names; for Unix-like shells")) - call BinOptionG("ssl", &ssl) - call AddOption("completeslash", gettext("specifies slash/backslash used for completion")) - call OptionG("csl", &csl) - endif + call AddOption("shellslash", gettext("use forward slashes in file names; for Unix-like shells")) + call BinOptionG("ssl", &ssl) + call AddOption("completeslash", gettext("specifies slash/backslash used for completion")) + call OptionG("csl", &csl) endif @@ -1236,12 +1225,6 @@ if has("rightleft") call AddOption("hkmapp", gettext("use phonetic Hebrew keyboard mapping")) call BinOptionG("hkp", &hkp) endif -if has("farsi") - call AddOption("altkeymap", gettext("use Farsi as the second language when 'revins' is set")) - call BinOptionG("akm", &akm) - call AddOption("fkmap", gettext("use Farsi keyboard mapping")) - call BinOptionG("fk", &fk) -endif if has("arabic") call AddOption("arabic", gettext("prepare for editing Arabic text")) call append("$", "\t" .. s:local_to_window) @@ -1310,7 +1293,7 @@ call BinOptionG("emo", &emo) call Header(gettext("various")) -call AddOption("virtualedit", gettext("when to use virtual editing: \"block\", \"insert\" and/or \"all\"")) +call AddOption("virtualedit", gettext("when to use virtual editing: \"block\", \"insert\", \"all\"\nand/or \"onemore\"")) call OptionG("ve", &ve) call AddOption("eventignore", gettext("list of autocommand events which are to be ignored")) call OptionG("ei", &ei) @@ -1350,7 +1333,7 @@ if has("quickfix") call AddOption("bufhidden", gettext("what happens with a buffer when it's no longer in a window")) call append("$", "\t" .. s:local_to_buffer) call OptionL("bh") - call AddOption("buftype", gettext("\"\", \"nofile\", \"nowrite\" or \"quickfix\": type of buffer")) + call AddOption("buftype", gettext("empty, \"nofile\", \"nowrite\", \"quickfix\", etc.: type of buffer")) call append("$", "\t" .. s:local_to_buffer) call OptionL("bt") endif diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim --- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim +++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim @@ -2,7 +2,7 @@ " " Author: Bram Moolenaar " Copyright: Vim license applies, see ":help license" -" Last Change: 2020 Aug 31 +" Last Change: 2020 Oct 25 " " WORK IN PROGRESS - Only the basics work " Note: On MS-Windows you need a recent version of gdb. The one included with @@ -119,7 +119,11 @@ func s:StartDebug_internal(dict) " call ch_logfile('debuglog', 'w') let s:sourcewin = win_getid(winnr()) - let s:startsigncolumn = &signcolumn + + " Remember the old value of 'signcolumn' for each buffer that it's set in, so + " that we can restore the value for all buffers. + let b:save_signcolumn = &signcolumn + let s:signcolumn_buflist = [bufnr()] let s:save_columns = 0 let s:allleft = 0 @@ -556,8 +560,20 @@ func s:EndDebugCommon() exe 'bwipe! ' . s:ptybuf endif + " Restore 'signcolumn' in all buffers for which it was set. call win_gotoid(s:sourcewin) - let &signcolumn = s:startsigncolumn + let was_buf = bufnr() + for bufnr in s:signcolumn_buflist + if bufexists(bufnr) + exe bufnr .. "buf" + if exists('b:save_signcolumn') + let &signcolumn = b:save_signcolumn + unlet b:save_signcolumn + endif + endif + endfor + exe was_buf .. "buf" + call s:DeleteCommands() call win_gotoid(curwinid) @@ -938,6 +954,10 @@ func s:HandleCursor(msg) exe lnum exe 'sign unplace ' . s:pc_id exe 'sign place ' . s:pc_id . ' line=' . lnum . ' name=debugPC priority=110 file=' . fname + if !exists('b:save_signcolumn') + let b:save_signcolumn = &signcolumn + call add(s:signcolumn_buflist, bufnr()) + endif setlocal signcolumn=yes endif elseif !s:stopped || fname != '' diff --git a/runtime/plugin/zipPlugin.vim b/runtime/plugin/zipPlugin.vim --- a/runtime/plugin/zipPlugin.vim +++ b/runtime/plugin/zipPlugin.vim @@ -20,14 +20,14 @@ if &cp || exists("g:loaded_zipPlugin") finish endif -let g:loaded_zipPlugin = "v30" +let g:loaded_zipPlugin = "v31" let s:keepcpo = &cpo set cpo&vim " --------------------------------------------------------------------- " Options: {{{1 if !exists("g:zipPlugin_ext") - let g:zipPlugin_ext='*.apk,*.celzip,*.crtx,*.docm,*.docx,*.dotm,*.dotx,*.ear,*.epub,*.gcsx,*.glox,*.gqsx,*.ja,*.jar,*.kmz,*.odb,*.odc,*.odf,*.odg,*.odi,*.odm,*.odp,*.ods,*.odt,*.otc,*.otf,*.otg,*.oth,*.oti,*.otp,*.ots,*.ott,*.oxt,*.potm,*.potx,*.ppam,*.ppsm,*.ppsx,*.pptm,*.pptx,*.sldx,*.thmx,*.vdw,*.war,*.wsz,*.xap,*.xlam,*.xlam,*.xlsb,*.xlsm,*.xlsx,*.xltm,*.xltx,*.xpi,*.zip' + let g:zipPlugin_ext='*.aar,*.apk,*.celzip,*.crtx,*.docm,*.docx,*.dotm,*.dotx,*.ear,*.epub,*.gcsx,*.glox,*.gqsx,*.ja,*.jar,*.kmz,*.odb,*.odc,*.odf,*.odg,*.odi,*.odm,*.odp,*.ods,*.odt,*.otc,*.otf,*.otg,*.oth,*.oti,*.otp,*.ots,*.ott,*.oxt,*.potm,*.potx,*.ppam,*.ppsm,*.ppsx,*.pptm,*.pptx,*.sldx,*.thmx,*.vdw,*.war,*.wsz,*.xap,*.xlam,*.xlam,*.xlsb,*.xlsm,*.xlsx,*.xltm,*.xltx,*.xpi,*.zip' endif " --------------------------------------------------------------------- diff --git a/runtime/syntax/elf.vim b/runtime/syntax/elf.vim --- a/runtime/syntax/elf.vim +++ b/runtime/syntax/elf.vim @@ -1,6 +1,6 @@ " Vim syntax file " Language: ELF -" Maintainer: Christian V. J. Brssow +" Maintainer: Christian V. J. Brüssow " Last Change: Son 22 Jun 2003 20:43:14 CEST " Filenames: *.ab,*.am " URL: http://www.cvjb.de/comp/vim/elf.vim diff --git a/runtime/syntax/forth.vim b/runtime/syntax/forth.vim --- a/runtime/syntax/forth.vim +++ b/runtime/syntax/forth.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: FORTH " Current Maintainer: Johan Kotlinski -" Previous Maintainer: Christian V. J. Brssow +" Previous Maintainer: Christian V. J. Brüssow " Last Change: 2018-03-29 " Filenames: *.fs,*.ft " URL: https://github.com/jkotlinski/forth.vim diff --git a/runtime/syntax/fortran.vim b/runtime/syntax/fortran.vim --- a/runtime/syntax/fortran.vim +++ b/runtime/syntax/fortran.vim @@ -8,10 +8,10 @@ " older Fortran 77 syntax file by Mario Eusebio and Preben Guldberg. " Since then, useful suggestions and contributions have been made, in order, by: " Andrej Panjkov, Bram Moolenaar, Thomas Olsen, Michael Sternberg, Christian Reile, -" Walter Dieudonn, Alexander Wagner, Roman Bertle, Charles Rendleman, +" Walter Dieudonné, Alexander Wagner, Roman Bertle, Charles Rendleman, " Andrew Griffiths, Joe Krahn, Hendrik Merx, Matt Thompson, Jan Hermann, -" Stefano Zaghi, Vishnu V. Krishnan, Judical Grasset, Takuma Yoshida, -" Eisuke Kawashima, and Andr Chalella.` +" Stefano Zaghi, Vishnu V. Krishnan, Judicaël Grasset, Takuma Yoshida, +" Eisuke Kawashima, and André Chalella.` if exists("b:current_syntax") finish diff --git a/runtime/syntax/groff.vim b/runtime/syntax/groff.vim --- a/runtime/syntax/groff.vim +++ b/runtime/syntax/groff.vim @@ -1,6 +1,6 @@ " VIM syntax file " Language: groff -" Maintainer: Alejandro Lpez-Valencia +" Maintainer: Alejandro López-Valencia " URL: http://dradul.tripod.com/vim " Last Change: 2003-05-08-12:41:13 GMT-5. diff --git a/runtime/syntax/initng.vim b/runtime/syntax/initng.vim --- a/runtime/syntax/initng.vim +++ b/runtime/syntax/initng.vim @@ -1,6 +1,6 @@ " Vim syntax file " Language: initng .i files -" Maintainer: Elan Ruusame +" Maintainer: Elan Ruusamäe " URL: http://glen.alkohol.ee/pld/initng/ " License: GPL v2 " Version: 0.13 diff --git a/runtime/syntax/iss.vim b/runtime/syntax/iss.vim --- a/runtime/syntax/iss.vim +++ b/runtime/syntax/iss.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Inno Setup File (iss file) and My InnoSetup extension " Maintainer: Jason Mills (jmills@cs.mun.ca) -" Previous Maintainer: Dominique Stphan (dominique@mggen.com) +" Previous Maintainer: Dominique Stéphan (dominique@mggen.com) " Last Change: 2019 Sep 27 " " Todo: diff --git a/runtime/syntax/lout.vim b/runtime/syntax/lout.vim --- a/runtime/syntax/lout.vim +++ b/runtime/syntax/lout.vim @@ -1,6 +1,6 @@ " Vim syntax file " Language: Lout -" Maintainer: Christian V. J. Brssow +" Maintainer: Christian V. J. Brüssow " Last Change: So 12 Feb 2012 15:15:03 CET " Filenames: *.lout,*.lt " URL: http://www.cvjb.de/comp/vim/lout.vim diff --git a/runtime/syntax/mmix.vim b/runtime/syntax/mmix.vim --- a/runtime/syntax/mmix.vim +++ b/runtime/syntax/mmix.vim @@ -1,6 +1,6 @@ " Vim syntax file " Language: MMIX -" Maintainer: Dirk Hsken, +" Maintainer: Dirk Hüsken, " Last Change: 2012 Jun 01 " (Dominique Pelle added @Spell) " Filenames: *.mms diff --git a/runtime/syntax/moo.vim b/runtime/syntax/moo.vim --- a/runtime/syntax/moo.vim +++ b/runtime/syntax/moo.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: MOO " Maintainer: Timo Frenay -" Last Change: 2001 Oct 06 +" Last Change: 2020 Oct 19 " Note: Requires Vim 6.0 or above " quit when a syntax file was already loaded @@ -95,7 +95,7 @@ if exists("moo_unknown_builtin_functions syn keyword mooKnownBuiltinFunction abs acos add_property add_verb asin atan binary_hash boot_player buffered_output_length callers caller_perms call_function ceil children chparent clear_property connected_players connected_seconds connection_name connection_option connection_options cos cosh create crypt ctime db_disk_size decode_binary delete_property delete_verb disassemble dump_database encode_binary equal eval exp floatstr floor flush_input force_input function_info idle_seconds index is_clear_property is_member is_player kill_task length listappend listdelete listen listeners listinsert listset log log10 match max max_object memory_usage min move notify object_bytes open_network_connection output_delimiters parent pass players properties property_info queued_tasks queue_info raise random read recycle renumber reset_max_object resume rindex rmatch seconds_left server_log server_version setadd setremove set_connection_option set_player_flag set_property_info set_task_perms set_verb_args set_verb_code set_verb_info shutdown sin sinh sqrt strcmp string_hash strsub substitute suspend tan tanh task_id task_stack ticks_left time tofloat toint toliteral tonum toobj tostr trunc typeof unlisten valid value_bytes value_hash verbs verb_args verb_code verb_info contained endif -"Enclosed expressions +" Enclosed expressions syn match mooUnenclosedError display ~[')\]|}]~ syn match mooParenthesesError display ~[';\]|}]~ contained syn region mooParentheses start=~(~ end=~)~ transparent contains=@mooEnclosedContents,mooParenthesesError diff --git a/runtime/syntax/nroff.vim b/runtime/syntax/nroff.vim --- a/runtime/syntax/nroff.vim +++ b/runtime/syntax/nroff.vim @@ -1,6 +1,6 @@ " VIM syntax file " Language: nroff/groff -" Maintainer: Pedro Alejandro Lpez-Valencia +" Maintainer: Pedro Alejandro López-Valencia " URL: http://vorbote.wordpress.com/ " Last Change: 2012 Feb 2 " @@ -8,7 +8,7 @@ " " ACKNOWLEDGEMENTS: " -" My thanks to Jrme Plt , who was the +" My thanks to Jérôme Plût , who was the " creator and maintainer of this syntax file for several years. " May I be as good at it as he has been. " diff --git a/runtime/syntax/pascal.vim b/runtime/syntax/pascal.vim --- a/runtime/syntax/pascal.vim +++ b/runtime/syntax/pascal.vim @@ -2,7 +2,7 @@ " Language: Pascal " Version: 2.8 " Last Change: 2004/10/17 17:47:30 -" Maintainer: Xavier Crgut +" Maintainer: Xavier Crégut " Previous Maintainer: Mario Eusebio " Contributors: Tim Chase , diff --git a/runtime/syntax/robots.vim b/runtime/syntax/robots.vim --- a/runtime/syntax/robots.vim +++ b/runtime/syntax/robots.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: "Robots.txt" files " Robots.txt files indicate to WWW robots which parts of a web site should not be accessed. -" Maintainer: Dominique Stphan (dominique@mggen.com) +" Maintainer: Dominique Stéphan (dominique@mggen.com) " URL: http://www.mggen.com/vim/syntax/robots.zip " Last change: 2001 May 09 diff --git a/runtime/syntax/rpl.vim b/runtime/syntax/rpl.vim --- a/runtime/syntax/rpl.vim +++ b/runtime/syntax/rpl.vim @@ -2,7 +2,7 @@ " Language: RPL/2 " Version: 0.15.15 against RPL/2 version 4.00pre7i " Last Change: 2012 Feb 03 by Thilo Six -" Maintainer: Jol BERTRAND +" Maintainer: Joël BERTRAND " URL: http://www.makalis.fr/~bertrand/rpl2/download/vim/indent/rpl.vim " Credits: Nothing diff --git a/runtime/syntax/rtf.vim b/runtime/syntax/rtf.vim --- a/runtime/syntax/rtf.vim +++ b/runtime/syntax/rtf.vim @@ -7,7 +7,7 @@ " .hlp (windows help files) use compiled rtf files " rtf documentation at http://night.primate.wisc.edu/software/RTF/ " -" Maintainer: Dominique Stphan (dominique@mggen.com) +" Maintainer: Dominique Stéphan (dominique@mggen.com) " URL: http://www.mggen.com/vim/syntax/rtf.zip " Last change: 2001 Mai 02 diff --git a/runtime/syntax/tilde.vim b/runtime/syntax/tilde.vim --- a/runtime/syntax/tilde.vim +++ b/runtime/syntax/tilde.vim @@ -1,7 +1,7 @@ " Vim syntax file " This file works only for Vim6.x " Language: Tilde -" Maintainer: Tobias Rundstrm +" Maintainer: Tobias Rundström " URL: http://www.tildesoftware.net " CVS: $Id: tilde.vim,v 1.1 2004/06/13 19:31:51 vimboss Exp $ diff --git a/runtime/syntax/xkb.vim b/runtime/syntax/xkb.vim --- a/runtime/syntax/xkb.vim +++ b/runtime/syntax/xkb.vim @@ -2,7 +2,7 @@ " This is a GENERATED FILE. Please always refer to source file at the URI below. " Language: XKB (X Keyboard Extension) components " Maintainer: David Ne\v{c}as (Yeti) -" Last Change: 2020 Oct 06 +" Last Change: 2020 Oct 18 " URL: http://trific.ath.cx/Ftp/vim/syntax/xkb.vim " Setup @@ -41,7 +41,7 @@ syn match xkbPhysicalKey "<\w\+>" syn keyword xkbPreproc augment include replace syn keyword xkbConstant False True syn keyword xkbModif override replace -syn keyword xkbIdentifier action affect alias allowExplicit approx baseColor button clearLocks color controls cornerRadius count ctrls description driveskbd font fontSize gap group groups height indicator indicatorDrivesKeyboard interpret key keys labelColor latchToLock latchMods left level_name map maximum minimum modifier_map modifiers name offColor onColor outline preserve priority repeat row section section setMods shape slant solid symbols text top type useModMapMods virtualModifier virtualMods virtual_modifiers weight whichModState width +syn keyword xkbIdentifier action affect alias allowExplicit approx baseColor button clearLocks color controls cornerRadius count ctrls description driveskbd font fontSize gap group groups height indicator indicatorDrivesKeyboard interpret key keys labelColor latchToLock latchMods left level_name map maximum minimum modifier_map modifiers name offColor onColor outline preserve priority repeat row section setMods shape slant solid symbols text top type useModMapMods virtualModifier virtualMods virtual_modifiers weight whichModState width syn keyword xkbFunction AnyOf ISOLock LatchGroup LatchMods LockControls LockGroup LockMods LockPointerButton MovePtr NoAction PointerButton SetControls SetGroup SetMods SetPtrDflt Terminate syn keyword xkbTModif default hidden partial virtual syn keyword xkbSect alphanumeric_keys alternate_group function_keys keypad_keys modifier_keys xkb_compatibility xkb_geometry xkb_keycodes xkb_keymap xkb_semantics xkb_symbols xkb_types diff --git a/src/po/af.po b/src/po/af.po --- a/src/po/af.po +++ b/src/po/af.po @@ -3557,8 +3557,6 @@ msgstr "E538: Geen muisondersteuning nie msgid "E540: Unclosed expression sequence" msgstr "E540: Onvoltooide uitdrukkingreeks" -msgid "E541: too many items" -msgstr "E541: te veel items" msgid "E542: unbalanced groups" msgstr "E542: ongebalanseerde groepe" diff --git a/src/po/ca.po b/src/po/ca.po --- a/src/po/ca.po +++ b/src/po/ca.po @@ -4253,8 +4253,6 @@ msgstr "E538: No hi ha suport per a ratol" msgid "E540: Unclosed expression sequence" msgstr "E540: Seqncia d'expressions no tancada" -msgid "E541: too many items" -msgstr "E541: massa tems" msgid "E542: unbalanced groups" msgstr "E542: grups desequilibrats" diff --git a/src/po/da.po b/src/po/da.po --- a/src/po/da.po +++ b/src/po/da.po @@ -4346,8 +4346,6 @@ msgstr "E538: Ingen understøttelse af mus" msgid "E540: Unclosed expression sequence" msgstr "E540: Ulukket udtryk-sekvens" -msgid "E541: too many items" -msgstr "E541: for mange punkter" msgid "E542: unbalanced groups" msgstr "E542: ubalancerede grupper" diff --git a/src/po/de.po b/src/po/de.po --- a/src/po/de.po +++ b/src/po/de.po @@ -4098,8 +4098,6 @@ msgstr "Fr Option %s" msgid "E540: Unclosed expression sequence" msgstr "E540: Nicht-geschlossene Ausdrucksfolge" -msgid "E541: too many items" -msgstr "E541: Zu viele Elemente" msgid "E542: unbalanced groups" msgstr "E542: Unausgewogene Gruppen" diff --git a/src/po/en_GB.po b/src/po/en_GB.po --- a/src/po/en_GB.po +++ b/src/po/en_GB.po @@ -557,8 +557,6 @@ msgid "E536: comma required" msgstr "E536: Comma required" -msgid "E541: too many items" -msgstr "E541: Too many items" msgid "E542: unbalanced groups" msgstr "E542: Unbalanced groups" diff --git a/src/po/eo.po b/src/po/eo.po --- a/src/po/eo.po +++ b/src/po/eo.po @@ -4041,8 +4041,6 @@ msgstr "Por opcio %s" msgid "E540: Unclosed expression sequence" msgstr "E540: '}' mankas" -msgid "E541: too many items" -msgstr "E541: tro da elementoj" msgid "E542: unbalanced groups" msgstr "E542: misekvilibraj grupoj" diff --git a/src/po/es.po b/src/po/es.po --- a/src/po/es.po +++ b/src/po/es.po @@ -4266,8 +4266,6 @@ msgstr "E538: No hay soporte para el ratón" msgid "E540: Unclosed expression sequence" msgstr "E540: Secuencia de expresión sin cerrar" -msgid "E541: too many items" -msgstr "E541: Demasiados elementos" msgid "E542: unbalanced groups" msgstr "E542: Grupos sin equilibrar" diff --git a/src/po/fi.po b/src/po/fi.po --- a/src/po/fi.po +++ b/src/po/fi.po @@ -4297,8 +4297,6 @@ msgstr "E538: Hiirtä ei tueta" msgid "E540: Unclosed expression sequence" msgstr "E540: Sulkematon lausekesarja" -msgid "E541: too many items" -msgstr "E541: liikaa kohteita" msgid "E542: unbalanced groups" msgstr "E542: epätasapainoisia ryhmiä" diff --git a/src/po/fr.po b/src/po/fr.po --- a/src/po/fr.po +++ b/src/po/fr.po @@ -4380,8 +4380,6 @@ msgstr "Pour l'option %s" msgid "E540: Unclosed expression sequence" msgstr "E540: '}' manquant" -msgid "E541: too many items" -msgstr "E541: trop d'lments" msgid "E542: unbalanced groups" msgstr "E542: parenthses non quilibres" diff --git a/src/po/ga.po b/src/po/ga.po --- a/src/po/ga.po +++ b/src/po/ga.po @@ -4375,8 +4375,6 @@ msgstr "E538: Gan tacaocht luiche" msgid "E540: Unclosed expression sequence" msgstr "E540: Seicheamh gan dnadh" -msgid "E541: too many items" -msgstr "E541: an iomarca mreanna" msgid "E542: unbalanced groups" msgstr "E542: grpa neamhchothromaithe" diff --git a/src/po/it.po b/src/po/it.po --- a/src/po/it.po +++ b/src/po/it.po @@ -4136,8 +4136,6 @@ msgstr "E538: Manca supporto mouse" msgid "E540: Unclosed expression sequence" msgstr "E540: Espressione non terminata" -msgid "E541: too many items" -msgstr "E541: troppi elementi" msgid "E542: unbalanced groups" msgstr "E542: gruppi sbilanciati" diff --git a/src/po/ja.euc-jp.po b/src/po/ja.euc-jp.po --- a/src/po/ja.euc-jp.po +++ b/src/po/ja.euc-jp.po @@ -4142,8 +4142,6 @@ msgstr "ץ: %s" msgid "E540: Unclosed expression sequence" msgstr "E540: λƤޤ" -msgid "E541: too many items" -msgstr "E541: Ǥ¿᤮ޤ" msgid "E542: unbalanced groups" msgstr "E542: 롼פ礤ޤ" diff --git a/src/po/ja.po b/src/po/ja.po --- a/src/po/ja.po +++ b/src/po/ja.po @@ -4142,8 +4142,6 @@ msgstr "オプション: %s" msgid "E540: Unclosed expression sequence" msgstr "E540: 式が終了していません" -msgid "E541: too many items" -msgstr "E541: 要素が多過ぎます" msgid "E542: unbalanced groups" msgstr "E542: グループが釣合いません" diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po --- a/src/po/ja.sjis.po +++ b/src/po/ja.sjis.po @@ -4142,8 +4142,6 @@ msgstr "IvV: %s" msgid "E540: Unclosed expression sequence" msgstr "E540: IĂ܂" -msgid "E541: too many items" -msgstr "E541: vf߂܂" msgid "E542: unbalanced groups" msgstr "E542: O[vލ܂" diff --git a/src/po/ko.UTF-8.po b/src/po/ko.UTF-8.po --- a/src/po/ko.UTF-8.po +++ b/src/po/ko.UTF-8.po @@ -4282,8 +4282,6 @@ msgstr "E538: 마우스를 지원하지 않습니다" msgid "E540: Unclosed expression sequence" msgstr "E540: 닫히지 않은 표현식 배열" -msgid "E541: too many items" -msgstr "E541: 너무 많은 항목" msgid "E542: unbalanced groups" msgstr "E542: 균형이 안 잡힌 그룹" diff --git a/src/po/ko.po b/src/po/ko.po --- a/src/po/ko.po +++ b/src/po/ko.po @@ -4282,8 +4282,6 @@ msgstr "E538: 콺 ʽϴ" msgid "E540: Unclosed expression sequence" msgstr "E540: ǥ 迭" -msgid "E541: too many items" -msgstr "E541: ʹ ׸" msgid "E542: unbalanced groups" msgstr "E542: ׷" diff --git a/src/po/nb.po b/src/po/nb.po --- a/src/po/nb.po +++ b/src/po/nb.po @@ -4124,8 +4124,6 @@ msgstr "E538: Ingen sttte for mus" msgid "E540: Unclosed expression sequence" msgstr "E540: Uttrykkssekvens som ikke er lukket" -msgid "E541: too many items" -msgstr "E541: For mange elementer" msgid "E542: unbalanced groups" msgstr "E542: Ubalanserte grupper" diff --git a/src/po/nl.po b/src/po/nl.po --- a/src/po/nl.po +++ b/src/po/nl.po @@ -3715,8 +3715,6 @@ msgstr "E538: geen muisondersteuning" msgid "E540: Unclosed expression sequence" msgstr "E540: ongepaarde expressie-volgorde" -msgid "E541: too many items" -msgstr "E541: teveel items" msgid "E542: unbalanced groups" msgstr "E542: ongepaarde groepen" diff --git a/src/po/no.po b/src/po/no.po --- a/src/po/no.po +++ b/src/po/no.po @@ -4124,8 +4124,6 @@ msgstr "E538: Ingen sttte for mus" msgid "E540: Unclosed expression sequence" msgstr "E540: Uttrykkssekvens som ikke er lukket" -msgid "E541: too many items" -msgstr "E541: For mange elementer" msgid "E542: unbalanced groups" msgstr "E542: Ubalanserte grupper" diff --git a/src/po/pl.UTF-8.po b/src/po/pl.UTF-8.po --- a/src/po/pl.UTF-8.po +++ b/src/po/pl.UTF-8.po @@ -4308,8 +4308,6 @@ msgstr "E538: Brak wspomagania myszki" msgid "E540: Unclosed expression sequence" msgstr "E540: Niedomknięty ciąg wyrażeń" -msgid "E541: too many items" -msgstr "E541: zbyt wiele elementów" msgid "E542: unbalanced groups" msgstr "E542: niezbalansowane grupy" diff --git a/src/po/pl.cp1250.po b/src/po/pl.cp1250.po --- a/src/po/pl.cp1250.po +++ b/src/po/pl.cp1250.po @@ -4308,8 +4308,6 @@ msgstr "E538: Brak wspomagania myszki" msgid "E540: Unclosed expression sequence" msgstr "E540: Niedomknity cig wyrae" -msgid "E541: too many items" -msgstr "E541: zbyt wiele elementw" msgid "E542: unbalanced groups" msgstr "E542: niezbalansowane grupy" diff --git a/src/po/pl.po b/src/po/pl.po --- a/src/po/pl.po +++ b/src/po/pl.po @@ -4308,8 +4308,6 @@ msgstr "E538: Brak wspomagania myszki" msgid "E540: Unclosed expression sequence" msgstr "E540: Niedomknity cig wyrae" -msgid "E541: too many items" -msgstr "E541: zbyt wiele elementw" msgid "E542: unbalanced groups" msgstr "E542: niezbalansowane grupy" diff --git a/src/po/pt_BR.po b/src/po/pt_BR.po --- a/src/po/pt_BR.po +++ b/src/po/pt_BR.po @@ -4308,8 +4308,6 @@ msgstr "E538: Não há suporte a mouse" msgid "E540: Unclosed expression sequence" msgstr "E540: Expressão não terminada com '}'" -msgid "E541: too many items" -msgstr "E541: itens demais" msgid "E542: unbalanced groups" msgstr "E542: parênteses desequilibrados" diff --git a/src/po/ru.cp1251.po b/src/po/ru.cp1251.po --- a/src/po/ru.cp1251.po +++ b/src/po/ru.cp1251.po @@ -4249,8 +4249,6 @@ msgstr " %s" msgid "E540: Unclosed expression sequence" msgstr "E540: " -msgid "E541: too many items" -msgstr "E541: " msgid "E542: unbalanced groups" msgstr "E542: " diff --git a/src/po/ru.po b/src/po/ru.po --- a/src/po/ru.po +++ b/src/po/ru.po @@ -4249,8 +4249,6 @@ msgstr "Для опции %s" msgid "E540: Unclosed expression sequence" msgstr "E540: Незакрытая последовательность выражения" -msgid "E541: too many items" -msgstr "E541: Слишком много элементов" msgid "E542: unbalanced groups" msgstr "E542: Несбалансированные группы" diff --git a/src/po/sk.cp1250.po b/src/po/sk.cp1250.po --- a/src/po/sk.cp1250.po +++ b/src/po/sk.cp1250.po @@ -3897,8 +3897,6 @@ msgstr "E538: Bez podpory myi" msgid "E540: Unclosed expression sequence" msgstr "E540: Neuzatvoren zoskupenie vrazov" -msgid "E541: too many items" -msgstr "E541: prli mnoho poloiek" msgid "E542: unbalanced groups" msgstr "E542: nevyven skupiny" diff --git a/src/po/sk.po b/src/po/sk.po --- a/src/po/sk.po +++ b/src/po/sk.po @@ -3897,8 +3897,6 @@ msgstr "E538: Bez podpory myi" msgid "E540: Unclosed expression sequence" msgstr "E540: Neuzatvoren zoskupenie vrazov" -msgid "E541: too many items" -msgstr "E541: prli mnoho poloiek" msgid "E542: unbalanced groups" msgstr "E542: nevyven skupiny" diff --git a/src/po/sr.po b/src/po/sr.po --- a/src/po/sr.po +++ b/src/po/sr.po @@ -4205,8 +4205,6 @@ msgstr "За опцију %s" msgid "E540: Unclosed expression sequence" msgstr "E540: Низ израза није затворен" -msgid "E541: too many items" -msgstr "E541: превише ставки" msgid "E542: unbalanced groups" msgstr "E542: неуравнотежене групе" diff --git a/src/po/sv.po b/src/po/sv.po --- a/src/po/sv.po +++ b/src/po/sv.po @@ -4103,8 +4103,6 @@ msgstr "E538: Inget musstd" msgid "E540: Unclosed expression sequence" msgstr "E540: Ostngd uttryckssekvens" -msgid "E541: too many items" -msgstr "E541: fr mnga freml" msgid "E542: unbalanced groups" msgstr "E542: obalanserade grupper" diff --git a/src/po/tr.po b/src/po/tr.po --- a/src/po/tr.po +++ b/src/po/tr.po @@ -3990,8 +3990,6 @@ msgstr "%s seçeneği için" msgid "E540: Unclosed expression sequence" msgstr "E540: Kapatılmamış ifade sıralaması" -msgid "E541: too many items" -msgstr "E541: Çok fazla öge" msgid "E542: unbalanced groups" msgstr "E542: Dengelenmemiş gruplar" diff --git a/src/po/uk.cp1251.po b/src/po/uk.cp1251.po --- a/src/po/uk.cp1251.po +++ b/src/po/uk.cp1251.po @@ -4458,8 +4458,6 @@ msgstr "E538: " msgid "E540: Unclosed expression sequence" msgstr "E540: " -msgid "E541: too many items" -msgstr "E541: " msgid "E542: unbalanced groups" msgstr "E542: " diff --git a/src/po/uk.po b/src/po/uk.po --- a/src/po/uk.po +++ b/src/po/uk.po @@ -4458,8 +4458,6 @@ msgstr "E538: Миша не підтримується" msgid "E540: Unclosed expression sequence" msgstr "E540: Послідовність виразів не завершено" -msgid "E541: too many items" -msgstr "E541: Забагато елементів" msgid "E542: unbalanced groups" msgstr "E542: Групи не збалансовано" diff --git a/src/po/vi.po b/src/po/vi.po --- a/src/po/vi.po +++ b/src/po/vi.po @@ -3602,8 +3602,6 @@ msgstr "E538: Chuột không được hỗ trợ" msgid "E540: Unclosed expression sequence" msgstr "E540: Dãy các biểu thức không đóng" -msgid "E541: too many items" -msgstr "E541: quá nhiều phần tử" msgid "E542: unbalanced groups" msgstr "E542: các nhóm không cân bằng" diff --git a/src/po/zh_CN.UTF-8.po b/src/po/zh_CN.UTF-8.po --- a/src/po/zh_CN.UTF-8.po +++ b/src/po/zh_CN.UTF-8.po @@ -4028,8 +4028,6 @@ msgstr "E538: 不支持鼠标" msgid "E540: Unclosed expression sequence" msgstr "E540: 没有结束的表达式序列" -msgid "E541: too many items" -msgstr "E541: 项目过多" msgid "E542: unbalanced groups" msgstr "E542: 错乱的组" diff --git a/src/po/zh_CN.cp936.po b/src/po/zh_CN.cp936.po --- a/src/po/zh_CN.cp936.po +++ b/src/po/zh_CN.cp936.po @@ -4028,8 +4028,6 @@ msgstr "E538: ֧" msgid "E540: Unclosed expression sequence" msgstr "E540: ûнıʽ" -msgid "E541: too many items" -msgstr "E541: Ŀ" msgid "E542: unbalanced groups" msgstr "E542: ҵ" diff --git a/src/po/zh_CN.po b/src/po/zh_CN.po --- a/src/po/zh_CN.po +++ b/src/po/zh_CN.po @@ -4028,8 +4028,6 @@ msgstr "E538: ֧" msgid "E540: Unclosed expression sequence" msgstr "E540: ûнıʽ" -msgid "E541: too many items" -msgstr "E541: Ŀ" msgid "E542: unbalanced groups" msgstr "E542: ҵ" diff --git a/src/po/zh_TW.UTF-8.po b/src/po/zh_TW.UTF-8.po --- a/src/po/zh_TW.UTF-8.po +++ b/src/po/zh_TW.UTF-8.po @@ -3587,8 +3587,6 @@ msgstr "E538: 不支援滑鼠" msgid "E540: Unclosed expression sequence" msgstr "E540: 沒有結束的運算式: " -msgid "E541: too many items" -msgstr "E541: 太多項目" msgid "E542: unbalanced groups" msgstr "E542: 不對稱的 group" diff --git a/src/po/zh_TW.po b/src/po/zh_TW.po --- a/src/po/zh_TW.po +++ b/src/po/zh_TW.po @@ -3580,8 +3580,6 @@ msgstr "E538: 䴩ƹ" msgid "E540: Unclosed expression sequence" msgstr "E540: SB⦡: " -msgid "E541: too many items" -msgstr "E541: Ӧh" msgid "E542: unbalanced groups" msgstr "E542: ٪ group"