diff --git a/usr/bin/ex.exe b/usr/bin/ex.exe index 0367800f79b..d6e5456efd2 100755 Binary files a/usr/bin/ex.exe and b/usr/bin/ex.exe differ diff --git a/usr/bin/rview.exe b/usr/bin/rview.exe index 0367800f79b..d6e5456efd2 100755 Binary files a/usr/bin/rview.exe and b/usr/bin/rview.exe differ diff --git a/usr/bin/rvim.exe b/usr/bin/rvim.exe index 8e2c842faac..d6e5456efd2 100755 Binary files a/usr/bin/rvim.exe and b/usr/bin/rvim.exe differ diff --git a/usr/bin/view.exe b/usr/bin/view.exe index 8e2c842faac..511236e5ef8 100755 Binary files a/usr/bin/view.exe and b/usr/bin/view.exe differ diff --git a/usr/bin/vim.exe b/usr/bin/vim.exe index e2a1d4123dc..511236e5ef8 100755 Binary files a/usr/bin/vim.exe and b/usr/bin/vim.exe differ diff --git a/usr/bin/vimdiff.exe b/usr/bin/vimdiff.exe index e2a1d4123dc..511236e5ef8 100755 Binary files a/usr/bin/vimdiff.exe and b/usr/bin/vimdiff.exe differ diff --git a/usr/bin/xxd.exe b/usr/bin/xxd.exe index fe732059636..f62f05ed8b8 100755 Binary files a/usr/bin/xxd.exe and b/usr/bin/xxd.exe differ diff --git a/usr/share/vim/vim90/autoload/netrw.vim b/usr/share/vim/vim90/autoload/netrw.vim index 2358e2627be..33a2fdd897b 100644 --- a/usr/share/vim/vim90/autoload/netrw.vim +++ b/usr/share/vim/vim90/autoload/netrw.vim @@ -1961,7 +1961,7 @@ endfun " Doing this means that netrw will not come up as having changed a " setting last when it really didn't actually change it. " -" Used by s:NetrwOptionsRestore() to restore each netrw-senstive setting +" Used by s:NetrwOptionsRestore() to restore each netrw-sensitive setting " keepvars are set up by s:NetrwOptionsSave fun! s:NetrwRestoreSetting(keepvar,setting) """ call Dfunc("s:NetrwRestoreSetting(a:keepvar<".a:keepvar."> a:setting<".a:setting.">)") @@ -5562,7 +5562,7 @@ fun! netrw#BrowseX(fname,remote) " cleanup: remove temporary file, " delete current buffer if success with handler, " return to prior buffer (directory listing) - " Feb 12, 2008: had to de-activiate removal of + " Feb 12, 2008: had to de-activate removal of " temporary file because it wasn't getting seen. " if remote == 1 && fname != a:fname "" call Decho("deleting temporary file<".fname.">",'~'.expand("")) diff --git a/usr/share/vim/vim90/autoload/phpcomplete.vim b/usr/share/vim/vim90/autoload/phpcomplete.vim index f9448cbd9bc..5b4263ae458 100644 --- a/usr/share/vim/vim90/autoload/phpcomplete.vim +++ b/usr/share/vim/vim90/autoload/phpcomplete.vim @@ -2907,7 +2907,7 @@ endfor " builtin class information let g:php_builtin_object_functions = {} -" When completing for 'everyting imaginable' (no class context, not a +" When completing for 'everything imaginable' (no class context, not a " variable) we need a list of built-in classes in a format of {'classname':''} " for performance reasons we precompile this too let g:php_builtin_classnames = {} diff --git a/usr/share/vim/vim90/autoload/rustfmt.vim b/usr/share/vim/vim90/autoload/rustfmt.vim index 652e6af33ab..8fd3858178a 100644 --- a/usr/share/vim/vim90/autoload/rustfmt.vim +++ b/usr/share/vim/vim90/autoload/rustfmt.vim @@ -25,7 +25,7 @@ function! rustfmt#DetectVersion() silent let s:rustfmt_help = system(g:rustfmt_command . " --help") let s:rustfmt_unstable_features = s:rustfmt_help =~# "--unstable-features" - " Build a comparable rustfmt version varible out of its `--version` output: + " Build a comparable rustfmt version variable out of its `--version` output: silent let l:rustfmt_version_full = system(g:rustfmt_command . " --version") let l:rustfmt_version_list = matchlist(l:rustfmt_version_full, \ '\vrustfmt ([0-9]+[.][0-9]+[.][0-9]+)') diff --git a/usr/share/vim/vim90/autoload/typeset.vim b/usr/share/vim/vim90/autoload/typeset.vim index 35cf17ba87f..a1a809221c2 100644 --- a/usr/share/vim/vim90/autoload/typeset.vim +++ b/usr/share/vim/vim90/autoload/typeset.vim @@ -97,7 +97,7 @@ enddef # Public interface {{{ # When a TeX document is split into several source files, each source file -# may contain a "magic line" specifiying the "root" file, e.g.: +# may contain a "magic line" specifying the "root" file, e.g.: # # % !TEX root = main.tex # diff --git a/usr/share/vim/vim90/colors/README.txt b/usr/share/vim/vim90/colors/README.txt index e4af1b9a9c4..f48c11e6fa8 100644 --- a/usr/share/vim/vim90/colors/README.txt +++ b/usr/share/vim/vim90/colors/README.txt @@ -111,11 +111,11 @@ please check the following items: - Do not use hard coded escape sequences, these will not work in other terminals. Always use #RRGGBB for the GUI. -- When targetting 8-16 colors terminals, don't count on "darkblue" to be blue +- When targeting 8-16 colors terminals, don't count on "darkblue" to be blue and dark, or on "2" to be even vaguely reddish. Names are more portable than numbers, though. -- When targetting 256 colors terminals, prefer colors 16-255 to colors 0-15 +- When targeting 256 colors terminals, prefer colors 16-255 to colors 0-15 for the same reason. - Typographic attributes (bold, italic, underline, reverse, etc.) are not diff --git a/usr/share/vim/vim90/doc/builtin.txt b/usr/share/vim/vim90/doc/builtin.txt index 029c08bbd94..5f57fdb59d3 100644 --- a/usr/share/vim/vim90/doc/builtin.txt +++ b/usr/share/vim/vim90/doc/builtin.txt @@ -3928,6 +3928,8 @@ getmousepos() *getmousepos()* wincol column inside "winid" line text line inside "winid" column text column inside "winid" + coladd offset (in screen columns) from the + start of the clicked char All numbers are 1-based. If not over a window, e.g. when in the command line, then only @@ -10117,9 +10119,9 @@ trim({text} [, {mask} [, {dir}]]) *trim()* Return {text} as a String where any character in {mask} is removed from the beginning and/or end of {text}. - If {mask} is not given, {mask} is all characters up to 0x20, - which includes Tab, space, NL and CR, plus the non-breaking - space character 0xa0. + If {mask} is not given, or is an empty string, {mask} is all + characters up to 0x20, which includes Tab, space, NL and CR, + plus the non-breaking space character 0xa0. The optional {dir} argument specifies where to remove the characters: @@ -10376,6 +10378,8 @@ virtcol2col({winid}, {lnum}, {col}) *virtcol2col()* character in window {winid} at buffer line {lnum} and virtual column {col}. + If buffer line {lnum} is an empty line, 0 is returned. + If {col} is greater than the last virtual column in line {lnum}, then the byte index of the character at the last virtual column is returned. diff --git a/usr/share/vim/vim90/doc/cmdline.txt b/usr/share/vim/vim90/doc/cmdline.txt index 9493658ed51..c5d0096ddb7 100644 --- a/usr/share/vim/vim90/doc/cmdline.txt +++ b/usr/share/vim/vim90/doc/cmdline.txt @@ -90,9 +90,11 @@ CTRL-SHIFT-Q Works just like CTRL-V, unless |modifyOtherKeys| is active, In the GUI the |key-notation| is inserted without simplifying. *c_* *c_Left* - cursor left + cursor left. See 'wildmenu' for behavior during wildmenu + completion mode. *c_* *c_Right* - cursor right + cursor right. See 'wildmenu' for behavior during wildmenu + completion mode. *c_* or *c_* cursor one WORD left @@ -102,7 +104,8 @@ CTRL-SHIFT-Q Works just like CTRL-V, unless |modifyOtherKeys| is active, CTRL-B or *c_CTRL-B* *c_* *c_Home* cursor to beginning of command-line CTRL-E or *c_CTRL-E* *c_* *c_End* - cursor to end of command-line + cursor to end of command-line. See 'wildmenu' for behavior + during wildmenu completion mode. *c_* Move the cursor to the position of the mouse click. @@ -237,6 +240,7 @@ CTRL-\ e {expr} *c_CTRL-\_e* CTRL-Y When there is a modeless selection, copy the selection into the clipboard. |modeless-selection| If there is no selection CTRL-Y is inserted as a character. + See 'wildmenu' for behavior during wildmenu completion mode. CTRL-M or CTRL-J *c_CTRL-M* *c_CTRL-J* *c_* *c_* *c_CR* or start entered command @@ -252,12 +256,14 @@ CTRL-C quit command-line without executing *c_* *c_Up* recall older command-line from history, whose beginning - matches the current command-line (see below). + matches the current command-line (see below). See 'wildmenu' + for behavior during wildmenu completion mode. {not available when compiled without the |+cmdline_hist| feature} *c_* *c_Down* recall more recent command-line from history, whose beginning - matches the current command-line (see below). + matches the current command-line (see below). See 'wildmenu' + for behavior during wildmenu completion mode. {not available when compiled without the |+cmdline_hist| feature} @@ -381,6 +387,7 @@ When editing the command-line, a few commands can be used to complete the word before the cursor. This is available for: - Command names: At the start of the command-line. +- |++opt| values. - Tags: Only after the ":tag" command. - File names: Only after a command that accepts a file name or a setting for an option that can be set to a file name. This is called file name @@ -463,11 +470,16 @@ When repeating 'wildchar' or CTRL-N you cycle through the matches, eventually ending up back to what was typed. If the first match is not what you wanted, you can use or CTRL-P to go straight back to what you typed. -The 'wildignorecase' option can be set to ignore case in filenames. - The 'wildmenu' option can be set to show the matches just above the command line. +The 'wildoptions' option provides additional configuration to use a popup menu +for 'wildmenu', and to use fuzzy matching. + +The 'wildignorecase' option can be set to ignore case in filenames. For +completing other texts (e.g. command names), the 'ignorecase' option is used +instead (fuzzy matching always ignores case, however). + If you like tcsh's autolist completion, you can use this mapping: :cnoremap X (Where X is the command key to use, is CTRL-L and is CTRL-D) diff --git a/usr/share/vim/vim90/doc/if_pyth.txt b/usr/share/vim/vim90/doc/if_pyth.txt index 3d3b92a662c..c0b968e07c9 100644 --- a/usr/share/vim/vim90/doc/if_pyth.txt +++ b/usr/share/vim/vim90/doc/if_pyth.txt @@ -754,8 +754,10 @@ you can use Vim without this file. MS-Windows ~ To use the Python interface the Python DLL must be in your search path. In a -console window type "path" to see what directories are used. The 'pythondll' -or 'pythonthreedll' option can be also used to specify the Python DLL. +console window type "path" to see what directories are used. If the DLL is +not found in your search path, Vim will check the registry to find the path +where Python is installed. The 'pythondll' or 'pythonthreedll' option can be +also used to specify the Python DLL. The name of the DLL should match the Python version Vim was compiled with. Currently the name for Python 2 is "python27.dll", that is for Python 2.7. @@ -782,6 +784,8 @@ and failures. With Stable ABI, this restriction is relaxed, and any Python 3 library with version of at least |v:python3_version| will work. See |has-python| for how to check if Stable ABI is supported, or see if version output includes |+python3/dyn-stable|. +On MS-Windows, 'pythonthreedll' will be set to "python3.dll". When searching +the DLL from the registry, Vim will search the latest version of Python. ============================================================================== 10. Python 3 *python3* diff --git a/usr/share/vim/vim90/doc/index.txt b/usr/share/vim/vim90/doc/index.txt index a302c59fe9a..6f4b5d74db9 100644 --- a/usr/share/vim/vim90/doc/index.txt +++ b/usr/share/vim/vim90/doc/index.txt @@ -1112,6 +1112,22 @@ tag command action in Command-line editing mode ~ |c_| toggle insert/overstrike mode |c_| cursor at mouse click +commands in wildmenu mode (see 'wildmenu') + + move up to parent / select the previous match + move down to submenu / select the next match + select the previous match / move up to parent + select the next match / move down to submenu + move into submenu when doing menu completion + CTRL-E stop completion and go back to original text + CTRL-Y accept selected match and stop completion + other stop completion and insert the typed character + +commands in wildmenu mode with 'wildoptions' set to "pum" + + select a match several entries back + select a match several entries forward + ============================================================================== 5. Terminal-Job mode *terminal-job-index* diff --git a/usr/share/vim/vim90/doc/options.txt b/usr/share/vim/vim90/doc/options.txt index c5186639040..cdb4992a745 100644 --- a/usr/share/vim/vim90/doc/options.txt +++ b/usr/share/vim/vim90/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 9.0. Last change: 2023 Aug 15 +*options.txt* For Vim version 9.0. Last change: 2023 Oct 14 VIM REFERENCE MANUAL by Bram Moolenaar @@ -192,10 +192,27 @@ To include white space in a string option value it has to be preceded with a backslash. To include a backslash you have to use two. Effectively this means that the number of backslashes in an option value is halved (rounded down). +In options 'path', 'cdpath', and 'tags', spaces have to be preceded with three +backslashes instead for compatibility with version 3.0 where the options can +be separated by either commas or spaces. +Comma-separated options like 'backupdir' and 'tags' will also require commas +to be escaped with two backslashes, whereas this is not needed for +non-comma-separated ones like 'makeprg'. +When setting options using |:let| and |literal-string|, you need to use one +fewer layer of backslash. A few examples: > - :set tags=tags\ /usr/tags results in "tags /usr/tags" - :set tags=tags\\,file results in "tags\,file" - :set tags=tags\\\ file results in "tags\ file" + :set makeprg=make\ file results in "make file" + :let &makeprg='make file' (same as above) + :set makeprg=make\\\ file results in "make\ file" + :set tags=tags\ /usr/tags results in "tags" and "/usr/tags" + :set tags=tags\\\ file results in "tags file" + :let &tags='tags\ file' (same as above) + + :set makeprg=make,file results in "make,file" + :set makeprg=make\\,file results in "make\,file" + :set tags=tags,file results in "tags" and "file" + :set tags=tags\\,file results in "tags,file" + :let &tags='tags\,file' (same as above) The "|" character separates a ":set" command from a following command. To include the "|" in the option value, use "\|" instead. This example sets the @@ -4423,8 +4440,8 @@ A jump table for the options with a short description can be found at |Q_op|. *'ignorecase'* *'ic'* *'noignorecase'* *'noic'* 'ignorecase' 'ic' boolean (default off) global - Ignore case in search patterns. Also used when searching in the tags - file. + Ignore case in search patterns, |cmdline-completion|, when + searching in the tags file, and non-|Vim9| |expr-==|. Also see 'smartcase' and 'tagcase'. Can be overruled by using "\c" or "\C" in the pattern, see |/ignorecase|. @@ -5468,6 +5485,7 @@ A jump table for the options with a short description can be found at |Q_op|. Increasing this limit above 200 also changes the maximum for Ex command recursion, see |E169|. See also |:function|. + Also used for maximum depth of callback functions. *'maxmapdepth'* *'mmd'* *E223* 'maxmapdepth' 'mmd' number (default 1000) @@ -8213,8 +8231,8 @@ A jump table for the options with a short description can be found at |Q_op|. |+emacs_tags|: "./tags,./TAGS,tags,TAGS") global or local to buffer |global-local| Filenames for the tag command, separated by spaces or commas. To - include a space or comma in a file name, precede it with a backslash - (see |option-backslash| about including spaces and backslashes). + include a space or comma in a file name, precede it with backslashes + (see |option-backslash| about including spaces/commas and backslashes). When a file name starts with "./", the '.' is replaced with the path of the current file. But only when the 'd' flag is not included in 'cpoptions'. Environment variables are expanded |:set_env|. Also see @@ -9235,6 +9253,8 @@ A jump table for the options with a short description can be found at |Q_op|. The character is not recognized when used inside a macro. See 'wildcharm' for that. Some keys will not work, such as CTRL-C, and Enter. + can be used, but hitting it twice in a row will still exit + command-line as a failsafe measure. Although 'wc' is a number option, you can set it to a special key: > :set wc= < NOTE: This option is set to the Vi default value when 'compatible' is @@ -9297,31 +9317,34 @@ A jump table for the options with a short description can be found at |Q_op|. as needed. The "wildmenu" mode is abandoned when a key is hit that is not used for selecting a completion. - While the "wildmenu" is active, not using the popup menu, the - following keys have special meanings: - - - select previous/next match (like CTRL-P/CTRL-N) - - in filename/menu name completion: move into a - subdirectory or submenu. + While the "wildmenu" is active, the following keys have special + meanings: + CTRL-P - go to the previous entry + CTRL-N - go to the next entry - in menu completion, when the cursor is just after a dot: move into a submenu. + CTRL-E - end completion, go back to what was there before + selecting a match. + CTRL-Y - accept the currently selected match and stop + completion. + + When not using the popup menu for command line completion, the + following keys have special meanings: + - select previous/next match (like CTRL-P/CTRL-N) - in filename/menu name completion: move up into parent directory or parent menu. + - in filename/menu name completion: move into a + subdirectory or submenu. When using the popup menu for command line completion, the following keys have special meanings: - - select next match (like CTRL-N) + - select previous/next match (like CTRL-P/CTRL-N) + - select a match several entries back + - select a match several entries further - in filename/menu name completion: move up into parent directory or parent menu. - in filename/menu name completion: move into a subdirectory or submenu. - - select previous match (like CTRL-P) - CTRL-E - end completion, go back to what was there before - selecting a match. - CTRL-N - go to the next entry - CTRL-P - go to the previous entry - CTRL-Y - accept the currently selected match and stop - completion. This makes the menus accessible from the console |console-menus|. diff --git a/usr/share/vim/vim90/doc/starting.txt b/usr/share/vim/vim90/doc/starting.txt index 58b8edcd354..f7e98c7bef4 100644 --- a/usr/share/vim/vim90/doc/starting.txt +++ b/usr/share/vim/vim90/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 9.0. Last change: 2023 May 30 +*starting.txt* For Vim version 9.0. Last change: 2023 Oct 17 VIM REFERENCE MANUAL by Bram Moolenaar @@ -348,7 +348,7 @@ a slash. Thus "-R" means recovery and "-/R" readonly. Start logging and write entries to {filename}. This works like calling `ch_logfile({filename}, 'ao')` very early during startup. - {only available with the |+eval| feature} + {only available with the |+eval| and |+channel| feature} *-D* -D Debugging. Go to debugging mode when executing the first diff --git a/usr/share/vim/vim90/filetype.vim b/usr/share/vim/vim90/filetype.vim index c82c162dff4..88b60aa9d9c 100644 --- a/usr/share/vim/vim90/filetype.vim +++ b/usr/share/vim/vim90/filetype.vim @@ -544,6 +544,7 @@ au BufNewFile,BufRead copyright " Debian Sources.list au BufNewFile,BufRead */etc/apt/sources.list setf debsources au BufNewFile,BufRead */etc/apt/sources.list.d/*.list setf debsources +au BufNewFile,BufRead */etc/apt/sources.list.d/*.sources setf deb822sources " Deny hosts au BufNewFile,BufRead denyhosts.conf setf denyhosts @@ -1013,7 +1014,7 @@ au BufNewFile,BufRead ipf.conf,ipf6.conf,ipf.rules setf ipfilter au BufNewFile,BufRead *.4gl,*.4gh,*.m4gl setf fgl " .INI file for MSDOS -au BufNewFile,BufRead *.ini setf dosini +au BufNewFile,BufRead *.ini,*.INI setf dosini " SysV Inittab au BufNewFile,BufRead inittab setf inittab diff --git a/usr/share/vim/vim90/ftplugin/csh.vim b/usr/share/vim/vim90/ftplugin/csh.vim index ca5da5a8b92..2feec57bb25 100644 --- a/usr/share/vim/vim90/ftplugin/csh.vim +++ b/usr/share/vim/vim90/ftplugin/csh.vim @@ -3,9 +3,11 @@ " Maintainer: Doug Kearns " Previous Maintainer: Dan Sharp " Contributor: Johannes Zellner -" Last Change: 2021 Oct 15 +" Last Change: 2023 Oct 09 -if exists("b:did_ftplugin") | finish | endif +if exists("b:did_ftplugin") + finish +endif let b:did_ftplugin = 1 let s:save_cpo = &cpo @@ -18,7 +20,7 @@ setlocal formatoptions+=crql let b:undo_ftplugin = "setlocal com< cms< fo<" -" Csh: thanks to Johannes Zellner +" Csh: thanks to Johannes Zellner " - Both foreach and end must appear alone on separate lines. " - The words else and endif must appear at the beginning of input lines; " the if must appear alone on its input line or after an else. @@ -38,13 +40,14 @@ if exists("loaded_matchit") && !exists("b:match_words") \ s:line_start .. 'case\s\+:' .. s:line_start .. 'default\>:\:' .. \ s:line_start .. 'endsw\>' unlet s:line_start - let b:undo_ftplugin ..= " | unlet b:match_words" + let b:undo_ftplugin ..= " | unlet! b:match_words" endif if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") - let b:browsefilter="csh Scripts (*.csh)\t*.csh\n" .. - \ "All Files (*.*)\t*.*\n" - let b:undo_ftplugin ..= " | unlet b:browsefilter" + let b:browsefilter = "csh Scripts (*.csh)\t*.csh\n" .. + \ "All Files (*.*)\t*.*\n" + let b:csh_set_browsefilter = 1 + let b:undo_ftplugin ..= " | unlet! b:browsefilter b:csh_set_browsefilter" endif let &cpo = s:save_cpo diff --git a/usr/share/vim/vim90/ftplugin/gpg.vim b/usr/share/vim/vim90/ftplugin/gpg.vim index 2415555e09c..7fb4f47ed8a 100644 --- a/usr/share/vim/vim90/ftplugin/gpg.vim +++ b/usr/share/vim/vim90/ftplugin/gpg.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: gpg(1) configuration file " Previous Maintainer: Nikolai Weibull -" Latest Revision: 2008-07-09 +" Latest Revision: 2023-10-07 if exists("b:did_ftplugin") finish @@ -17,17 +17,17 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql if has('unix') && executable('less') if !has('gui_running') - command -buffer -nargs=1 Sman + command -buffer -nargs=1 GpgKeywordPrg \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s+--' . . '\b'' --hilite-search" man ' . 'gpg' | \ redraw! elseif has('terminal') - command -buffer -nargs=1 Sman + command -buffer -nargs=1 GpgKeywordPrg \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+--' . . '\b', '\') . ''' --hilite-search" man ' . 'gpg' endif - if exists(':Sman') == 2 + if exists(':GpgKeywordPrg') == 2 setlocal iskeyword+=- - setlocal keywordprg=:Sman - let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman' + setlocal keywordprg=:GpgKeywordPrg + let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer GpgKeywordPrg' endif endif diff --git a/usr/share/vim/vim90/ftplugin/modconf.vim b/usr/share/vim/vim90/ftplugin/modconf.vim index d5eda5af218..22d18a9aad8 100644 --- a/usr/share/vim/vim90/ftplugin/modconf.vim +++ b/usr/share/vim/vim90/ftplugin/modconf.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: modules.conf(5) configuration file " Previous Maintainer: Nikolai Weibull -" Latest Revision: 2008-07-09 +" Latest Revision: 2023-10-07 if exists("b:did_ftplugin") finish @@ -18,17 +18,17 @@ setlocal formatoptions-=t formatoptions+=croql if has('unix') && executable('less') if !has('gui_running') - command -buffer -nargs=1 Sman + command -buffer -nargs=1 ModconfKeywordPrg \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s{,8}' . . '\b'' --hilite-search" man ' . 'modprobe.d' | \ redraw! elseif has('terminal') - command -buffer -nargs=1 Sman + command -buffer -nargs=1 ModconfKeywordPrg \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s{,8}' . . '\b', '\') . ''' --hilite-search" man ' . 'modprobe.d' endif - if exists(':Sman') == 2 + if exists(':ModconfKeywordPrg') == 2 setlocal iskeyword+=- - setlocal keywordprg=:Sman - let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman' + setlocal keywordprg=:ModconfKeywordPrg + let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer ModconfKeywordPrg' endif endif diff --git a/usr/share/vim/vim90/ftplugin/muttrc.vim b/usr/share/vim/vim90/ftplugin/muttrc.vim index 7a4eb7a8bb9..c9f6df31d06 100644 --- a/usr/share/vim/vim90/ftplugin/muttrc.vim +++ b/usr/share/vim/vim90/ftplugin/muttrc.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: mutt RC File " Previous Maintainer: Nikolai Weibull -" Latest Revision: 2006-04-19 +" Latest Revision: 2023-10-07 if exists("b:did_ftplugin") finish @@ -20,17 +20,17 @@ let &l:include = '^\s*source\>' if has('unix') && executable('less') if !has('gui_running') - command -buffer -nargs=1 Sman + command -buffer -nargs=1 MuttrcKeywordPrg \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s+' . . '\b'' --hilite-search" man ' . 'muttrc' | \ redraw! elseif has('terminal') - command -buffer -nargs=1 Sman + command -buffer -nargs=1 MuttrcKeywordPrg \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . . '\b', '\') . ''' --hilite-search" man ' . 'muttrc' endif - if exists(':Sman') == 2 + if exists(':MuttrcKeywordPrg') == 2 setlocal iskeyword+=- - setlocal keywordprg=:Sman - let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman' + setlocal keywordprg=:MuttrcKeywordPrg + let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer MuttrcKeywordPrg' endif endif diff --git a/usr/share/vim/vim90/ftplugin/readline.vim b/usr/share/vim/vim90/ftplugin/readline.vim index a696da2701c..181d8ac661a 100644 --- a/usr/share/vim/vim90/ftplugin/readline.vim +++ b/usr/share/vim/vim90/ftplugin/readline.vim @@ -32,17 +32,17 @@ endif if has('unix') && executable('less') if !has('gui_running') - command -buffer -nargs=1 Sman + command -buffer -nargs=1 ReadlineKeywordPrg \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s+' . . '\b'' --hilite-search" man ' . '3 readline' | \ redraw! elseif has('terminal') - command -buffer -nargs=1 Sman + command -buffer -nargs=1 ReadlineKeywordPrg \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . . '\b', '\') . ''' --hilite-search" man ' . '3 readline' endif - if exists(':Sman') == 2 + if exists(':ReadlineKeywordPrg') == 2 setlocal iskeyword+=- - setlocal keywordprg=:Sman - let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman' + setlocal keywordprg=:ReadlineKeywordPrg + let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer ReadlineKeywordPrg' endif endif diff --git a/usr/share/vim/vim90/ftplugin/sshconfig.vim b/usr/share/vim/vim90/ftplugin/sshconfig.vim index c9a5cfaa689..4a054da52f3 100644 --- a/usr/share/vim/vim90/ftplugin/sshconfig.vim +++ b/usr/share/vim/vim90/ftplugin/sshconfig.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: OpenSSH client configuration file " Previous Maintainer: Nikolai Weibull -" Latest Revision: 2008-07-09 +" Latest Revision: 2023-10-07 if exists("b:did_ftplugin") finish @@ -16,17 +16,17 @@ let b:undo_ftplugin = 'setlocal com< cms< fo<' if has('unix') && executable('less') if !has('gui_running') - command -buffer -nargs=1 Sman + command -buffer -nargs=1 SshconfigKeywordPrg \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s+' . . '$'' --hilite-search" man ' . 'ssh_config' | \ redraw! elseif has('terminal') - command -buffer -nargs=1 Sman + command -buffer -nargs=1 SshconfigKeywordPrg \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . . '$', '\') . ''' --hilite-search" man ' . 'ssh_config' endif - if exists(':Sman') == 2 + if exists(':SshconfigKeywordPrg') == 2 setlocal iskeyword+=- - setlocal keywordprg=:Sman - let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman' + setlocal keywordprg=:SshconfigKeywordPrg + let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer SshconfigKeywordPrg' endif endif diff --git a/usr/share/vim/vim90/ftplugin/sudoers.vim b/usr/share/vim/vim90/ftplugin/sudoers.vim index b4123620af7..81ce7906a95 100644 --- a/usr/share/vim/vim90/ftplugin/sudoers.vim +++ b/usr/share/vim/vim90/ftplugin/sudoers.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: sudoers(5) configuration files " Previous Maintainer: Nikolai Weibull -" Latest Revision: 2008-07-09 +" Latest Revision: 2023-10-07 if exists("b:did_ftplugin") finish @@ -17,17 +17,17 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql if has('unix') && executable('less') if !has('gui_running') - command -buffer -nargs=1 Sman + command -buffer -nargs=1 SudoersKeywordPrg \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''\b' . . '\b'' --hilite-search" man ' . 'sudoers' | \ redraw! elseif has('terminal') - command -buffer -nargs=1 Sman + command -buffer -nargs=1 SudoersKeywordPrg \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('\b' . . '\b', '\') . ''' --hilite-search" man ' . 'sudoers' endif - if exists(':Sman') == 2 + if exists(':SudoersKeywordPrg') == 2 setlocal iskeyword+=- - setlocal keywordprg=:Sman - let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman' + setlocal keywordprg=:SudoersKeywordPrg + let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer SudoersKeywordPrg' endif endif diff --git a/usr/share/vim/vim90/ftplugin/systemd.vim b/usr/share/vim/vim90/ftplugin/systemd.vim index e60a5e49605..8bcacdd381e 100644 --- a/usr/share/vim/vim90/ftplugin/systemd.vim +++ b/usr/share/vim/vim90/ftplugin/systemd.vim @@ -1,6 +1,7 @@ " Vim filetype plugin file " Language: systemd.unit(5) " Keyword Lookup Support: Enno Nagel +" Latest Revision: 2023-10-07 if !exists('b:did_ftplugin') " Looks a lot like dosini files. @@ -9,11 +10,11 @@ endif if has('unix') && executable('less') if !has('gui_running') - command -buffer -nargs=1 Sman silent exe '!' . KeywordLookup_systemd() | redraw! + command -buffer -nargs=1 SystemdKeywordPrg silent exe '!' . KeywordLookup_systemd() | redraw! elseif has('terminal') - command -buffer -nargs=1 Sman silent exe 'term ' . KeywordLookup_systemd() + command -buffer -nargs=1 SystemdKeywordPrg silent exe 'term ' . KeywordLookup_systemd() endif - if exists(':Sman') == 2 + if exists(':SystemdKeywordPrg') == 2 if !exists('*KeywordLookup_systemd') function KeywordLookup_systemd(keyword) abort let matches = matchlist(getline(search('\v^\s*\[\s*.+\s*\]\s*$', 'nbWz')), '\v^\s*\[\s*(\k+).*\]\s*$') @@ -26,11 +27,11 @@ if has('unix') && executable('less') endfunction endif setlocal iskeyword+=- - setlocal keywordprg=:Sman + setlocal keywordprg=:SystemdKeywordPrg if !exists('b:undo_ftplugin') || empty(b:undo_ftplugin) let b:undo_ftplugin = 'setlocal keywordprg< iskeyword<' else - let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman' + let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer SystemdKeywordPrg' endif endif endif diff --git a/usr/share/vim/vim90/ftplugin/tcsh.vim b/usr/share/vim/vim90/ftplugin/tcsh.vim index 85d3873b335..b2467b43a2a 100644 --- a/usr/share/vim/vim90/ftplugin/tcsh.vim +++ b/usr/share/vim/vim90/ftplugin/tcsh.vim @@ -2,9 +2,11 @@ " Language: tcsh " Maintainer: Doug Kearns " Previous Maintainer: Dan Sharp -" Last Change: 2021 Oct 15 +" Last Change: 2023 Oct 09 -if exists("b:did_ftplugin") | finish | endif +if exists("b:did_ftplugin") + finish +endif let s:save_cpo = &cpo set cpo-=C @@ -12,24 +14,26 @@ set cpo-=C " Define some defaults in case the included ftplugins don't set them. let s:undo_ftplugin = "" let s:browsefilter = "csh Files (*.csh)\t*.csh\n" .. - \ "All Files (*.*)\t*.*\n" + \ "All Files (*.*)\t*.*\n" runtime! ftplugin/csh.vim ftplugin/csh_*.vim ftplugin/csh/*.vim let b:did_ftplugin = 1 " Override our defaults if these were set by an included ftplugin. if exists("b:undo_ftplugin") - let s:undo_ftplugin = b:undo_ftplugin + let s:undo_ftplugin = b:undo_ftplugin endif if exists("b:browsefilter") - let s:browsefilter = b:browsefilter + let s:browsefilter = b:browsefilter endif -if (has("gui_win32") || has("gui_gtk")) - let b:browsefilter="tcsh Scripts (*.tcsh)\t*.tcsh\n" .. s:browsefilter +if (has("gui_win32") || has("gui_gtk")) && + \ (!exists("b:browsefilter") || exists("b:csh_set_browsefilter")) + let b:browsefilter = "tcsh Scripts (*.tcsh)\t*.tcsh\n" .. s:browsefilter + let s:undo_ftplugin = "unlet! b:browsefilter | " .. s:undo_ftplugin endif -let b:undo_ftplugin = "unlet! b:browsefilter | " .. s:undo_ftplugin +let b:undo_ftplugin = s:undo_ftplugin let &cpo = s:save_cpo unlet s:save_cpo diff --git a/usr/share/vim/vim90/ftplugin/udevrules.vim b/usr/share/vim/vim90/ftplugin/udevrules.vim index 83fb728a54d..ec365f04c27 100644 --- a/usr/share/vim/vim90/ftplugin/udevrules.vim +++ b/usr/share/vim/vim90/ftplugin/udevrules.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: udev(8) rules file " Previous Maintainer: Nikolai Weibull -" Latest Revision: 2008-07-09 +" Latest Revision: 2023-10-07 if exists("b:did_ftplugin") finish @@ -17,17 +17,17 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql if has('unix') && executable('less') if !has('gui_running') - command -buffer -nargs=1 Sman + command -buffer -nargs=1 UdevrulesKeywordPrg \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s{,8}' . . '\b'' --hilite-search" man ' . 'udev' | \ redraw! elseif has('terminal') - command -buffer -nargs=1 Sman + command -buffer -nargs=1 UdevrulesKeywordPrg \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s{,8}' . . '\b', '\') . ''' --hilite-search" man ' . 'udev' endif - if exists(':Sman') == 2 + if exists(':UdevrulesKeywordPrg') == 2 setlocal iskeyword+=- - setlocal keywordprg=:Sman - let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman' + setlocal keywordprg=:UdevrulesKeywordPrg + let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer UdevrulesKeywordPrg' endif endif diff --git a/usr/share/vim/vim90/ftplugin/zsh.vim b/usr/share/vim/vim90/ftplugin/zsh.vim index ed75d040036..40986fccbee 100644 --- a/usr/share/vim/vim90/ftplugin/zsh.vim +++ b/usr/share/vim/vim90/ftplugin/zsh.vim @@ -2,7 +2,7 @@ " Language: Zsh shell script " Maintainer: Christian Brabandt " Previous Maintainer: Nikolai Weibull -" Latest Revision: 2021-04-03 +" Latest Revision: 2023-10-07 " License: Vim (see :h license) " Repository: https://github.com/chrisbra/vim-zsh @@ -20,17 +20,17 @@ let b:undo_ftplugin = "setl com< cms< fo< " if executable('zsh') && &shell !~# '/\%(nologin\|false\)$' if !has('gui_running') && executable('less') - command! -buffer -nargs=1 RunHelp silent exe '!MANPAGER= zsh -c "autoload -Uz run-help; run-help 2>/dev/null | LESS= less"' | redraw! + command! -buffer -nargs=1 ZshKeywordPrg silent exe '!MANPAGER= zsh -c "autoload -Uz run-help; run-help 2>/dev/null | LESS= less"' | redraw! elseif has('terminal') - command! -buffer -nargs=1 RunHelp silent exe ':term zsh -c "autoload -Uz run-help; run-help "' + command! -buffer -nargs=1 ZshKeywordPrg silent exe ':term zsh -c "autoload -Uz run-help; run-help "' else - command! -buffer -nargs=1 RunHelp echo system('zsh -c "autoload -Uz run-help; run-help 2>/dev/null"') + command! -buffer -nargs=1 ZshKeywordPrg echo system('zsh -c "autoload -Uz run-help; run-help 2>/dev/null"') endif if !exists('current_compiler') compiler zsh endif - setlocal keywordprg=:RunHelp - let b:undo_ftplugin .= 'keywordprg< | sil! delc -buffer RunHelp' + setlocal keywordprg=:ZshKeywordPrg + let b:undo_ftplugin .= 'keywordprg< | sil! delc -buffer ZshKeywordPrg' endif let b:match_words = '\:\:\:\' diff --git a/usr/share/vim/vim90/indent/cdl.vim b/usr/share/vim/vim90/indent/cdl.vim index 2c0fc7988eb..da675698cf7 100644 --- a/usr/share/vim/vim90/indent/cdl.vim +++ b/usr/share/vim/vim90/indent/cdl.vim @@ -21,7 +21,7 @@ endif " find out if an "...=..." expression is an assignment (or a conditional) " it scans 'line' first, and then the previous lines -fun! CdlAsignment(lnum, line) +fun! CdlAssignment(lnum, line) let f = -1 let lnum = a:lnum let line = a:line @@ -90,7 +90,7 @@ fun! CdlGetIndent(lnum) end end - " remove members [a] of [b]:[c]... (inicio remainds valid) + " remove members [a] of [b]:[c]... (inicio remains valid) let line = substitute(line, '\c\(\[[^]]*]\(\s*of\s*\|:\)*\)\+', ' ', 'g') while 1 " search for the next interesting element @@ -111,7 +111,7 @@ fun! CdlGetIndent(lnum) else " c == '=' " if it is an assignment increase indent if f == -1 " we don't know yet, find out - let f = CdlAsignment(lnum, strpart(line, 0, inicio)) + let f = CdlAssignment(lnum, strpart(line, 0, inicio)) end if f == 1 " formula increase it let ind = ind + shiftwidth() @@ -125,7 +125,7 @@ fun! CdlGetIndent(lnum) let ind = ind - shiftwidth() elseif match(thisline, '^\s*=') >= 0 if f == -1 " we don't know yet if is an assignment, find out - let f = CdlAsignment(lnum, "") + let f = CdlAssignment(lnum, "") end if f == 1 " formula increase it let ind = ind + shiftwidth() diff --git a/usr/share/vim/vim90/indent/erlang.vim b/usr/share/vim/vim90/indent/erlang.vim index 7aa38587a69..5682c31ef3a 100644 --- a/usr/share/vim/vim90/indent/erlang.vim +++ b/usr/share/vim/vim90/indent/erlang.vim @@ -1324,7 +1324,7 @@ function! s:ErlangCalcIndent2(lnum, stack) " maybe A else " LTI " - " Note about Emacs compabitility {{{ + " Note about Emacs compatibility {{{ " " It would be fine to indent the examples above the following way: " diff --git a/usr/share/vim/vim90/indent/julia.vim b/usr/share/vim/vim90/indent/julia.vim index 36f39f66528..efc98a2851b 100644 --- a/usr/share/vim/vim90/indent/julia.vim +++ b/usr/share/vim/vim90/indent/julia.vim @@ -310,7 +310,7 @@ function IsFunctionArgPar(lnum, c) endfunction function JumpToMatch(lnum, last_closed_bracket) - " we use the % command to skip back (tries to ues matchit if possible, + " we use the % command to skip back (tries to use matchit if possible, " otherwise resorts to vim's default, which is buggy but better than " nothing) call cursor(a:lnum, a:last_closed_bracket) diff --git a/usr/share/vim/vim90/indent/krl.vim b/usr/share/vim/vim90/indent/krl.vim index cc3cbd1abb1..89f45356baf 100644 --- a/usr/share/vim/vim90/indent/krl.vim +++ b/usr/share/vim/vim90/indent/krl.vim @@ -41,7 +41,7 @@ function GetKrlIndent() abort let currentLine = getline(v:lnum) if currentLine =~? '\v^;(\s*(end)?fold>)@!' && !get(g:, 'krlCommentIndent', 0) " If current line has a ; in column 1 and is no fold, keep zero indent. - " This may be usefull if code is commented out at the first column. + " This may be useful if code is commented out at the first column. return 0 endif @@ -117,7 +117,7 @@ function s:KrlPreNoneBlank(lnum) abort let nPreNoneBlank = prevnonblank(a:lnum) while nPreNoneBlank > 0 && getline(nPreNoneBlank) =~? '\v^\s*(\&\w\+|;|continue>)' - " Previouse none blank line irrelevant. Look further aback. + " Previous none blank line irrelevant. Look further aback. let nPreNoneBlank = prevnonblank(nPreNoneBlank - 1) endwhile diff --git a/usr/share/vim/vim90/indent/rapid.vim b/usr/share/vim/vim90/indent/rapid.vim index 2c99bb24911..b1fa00b8cc3 100644 --- a/usr/share/vim/vim90/indent/rapid.vim +++ b/usr/share/vim/vim90/indent/rapid.vim @@ -74,7 +74,7 @@ function s:GetRapidIndentIntern() abort if l:currentLine =~ '^!' && !get(g:,'rapidCommentIndent',0) " If current line is ! line comment, do not change indent - " This may be usefull if code is commented out at the first column. + " This may be useful if code is commented out at the first column. return 0 endif diff --git a/usr/share/vim/vim90/indent/systemverilog.vim b/usr/share/vim/vim90/indent/systemverilog.vim index a5f4d5b90de..42a05a03aac 100644 --- a/usr/share/vim/vim90/indent/systemverilog.vim +++ b/usr/share/vim/vim90/indent/systemverilog.vim @@ -78,10 +78,10 @@ function SystemVerilogIndent() " Multiple-line comment count if curr_line =~ '^\s*/\*' && curr_line !~ '/\*.\{-}\*/' let s:multiple_comment += 1 - if vverb | echom vverb_str "Start of multiple-line commnt" | endif + if vverb | echom vverb_str "Start of multiple-line comment" | endif elseif curr_line =~ '\*/\s*$' && curr_line !~ '/\*.\{-}\*/' let s:multiple_comment -= 1 - if vverb | echom vverb_str "End of multiple-line commnt" | endif + if vverb | echom vverb_str "End of multiple-line comment" | endif return ind endif " Maintain indentation during commenting. diff --git a/usr/share/vim/vim90/keymap/greek_utf-8.vim b/usr/share/vim/vim90/keymap/greek_utf-8.vim index 17564542d9d..c6cc32563e6 100644 --- a/usr/share/vim/vim90/keymap/greek_utf-8.vim +++ b/usr/share/vim/vim90/keymap/greek_utf-8.vim @@ -34,7 +34,7 @@ " without having to combine them with letters (usufull for grammarians " in particular) (especially for dasia and psiln we use ' for psili " (that is apostrophe) and ;' for dasia. This is done in order to -" preserve the posibility to write a plain < or >. +" preserve the possibility to write a plain < or >. " Ypogegrammeni is | following the character (the originally proposed " i after the character is problematic: can't write easily ai or vi) : diff --git a/usr/share/vim/vim90/lang/sr/LC_MESSAGES/vim.mo b/usr/share/vim/vim90/lang/sr/LC_MESSAGES/vim.mo index 8546401afa5..f11bde844c3 100644 Binary files a/usr/share/vim/vim90/lang/sr/LC_MESSAGES/vim.mo and b/usr/share/vim/vim90/lang/sr/LC_MESSAGES/vim.mo differ diff --git a/usr/share/vim/vim90/macros/maze/maze_mac b/usr/share/vim/vim90/macros/maze/maze_mac index 621aeec2b7d..b1e3487a950 100644 --- a/usr/share/vim/vim90/macros/maze/maze_mac +++ b/usr/share/vim/vim90/macros/maze/maze_mac @@ -190,7 +190,7 @@ map I G$?. ^GYKeDP0S2Gl " into the Macro register " GVJ - on bottom line, create a command to restore the current character " 0H - and save the command into the second Macro register -" `a@r - go back to the current position and exectute the macro to restore +" `a@r - go back to the current position and execute the macro to restore " the current character " @m - execute the action associated with this state " U - and repeat diff --git a/usr/share/vim/vim90/macros/urm/README.txt b/usr/share/vim/vim90/macros/urm/README.txt index a1ecc658ca4..39958136890 100644 --- a/usr/share/vim/vim90/macros/urm/README.txt +++ b/usr/share/vim/vim90/macros/urm/README.txt @@ -10,7 +10,7 @@ in vim: :so urm.vim in vim: * (to load the registers and boot the URM-machine :-) in vim: g (for 'go') and watch the fun. Per default, 3 and 4 are multiplied. Watch the Program counter, it is - visible as a komma moving around. + visible as a comma moving around. This is a "standard URM" (Universal register machine) interpreter. The URM concept is used in theoretical computer science to aid in theorem proving. diff --git a/usr/share/vim/vim90/pack/dist/opt/editorconfig/autoload/editorconfig_core/ini.vim b/usr/share/vim/vim90/pack/dist/opt/editorconfig/autoload/editorconfig_core/ini.vim index 55d2dee4ea6..73716969e70 100644 --- a/usr/share/vim/vim90/pack/dist/opt/editorconfig/autoload/editorconfig_core/ini.vim +++ b/usr/share/vim/vim90/pack/dist/opt/editorconfig/autoload/editorconfig_core/ini.vim @@ -1,6 +1,6 @@ " autoload/editorconfig_core/ini.vim: Config-file parser for " editorconfig-core-vimscript and editorconfig-vim. -" Modifed from the Python core's ini.py. +" Modified from the Python core's ini.py. " Copyright (c) 2012-2019 EditorConfig Team {{{2 " All rights reserved. diff --git a/usr/share/vim/vim90/pack/dist/opt/termdebug/plugin/termdebug.vim b/usr/share/vim/vim90/pack/dist/opt/termdebug/plugin/termdebug.vim index 7d9b80f5104..e6126ee6f38 100644 --- a/usr/share/vim/vim90/pack/dist/opt/termdebug/plugin/termdebug.vim +++ b/usr/share/vim/vim90/pack/dist/opt/termdebug/plugin/termdebug.vim @@ -1219,7 +1219,7 @@ func s:Run(args) call s:SendResumingCommand('-exec-run') endfunc -" :Frame - go to a specfic frame in the stack +" :Frame - go to a specific frame in the stack func s:Frame(arg) " Note: we explicit do not use mi's command " call s:SendCommand('-stack-select-frame "' . a:arg .'"') diff --git a/usr/share/vim/vim90/synmenu.vim b/usr/share/vim/vim90/synmenu.vim index 5251045a965..12cdcbdddf8 100644 --- a/usr/share/vim/vim90/synmenu.vim +++ b/usr/share/vim/vim90/synmenu.vim @@ -73,7 +73,7 @@ an 50.10.440 &Syntax.AB.Assembly.PIC :cal SetSyn("pic") an 50.10.450 &Syntax.AB.Assembly.Turbo :cal SetSyn("tasm") an 50.10.460 &Syntax.AB.Assembly.VAX\ Macro\ Assembly :cal SetSyn("vmasm") an 50.10.470 &Syntax.AB.Assembly.Z-80 :cal SetSyn("z8a") -an 50.10.480 &Syntax.AB.Assembly.xa\ 6502\ cross\ assember :cal SetSyn("a65") +an 50.10.480 &Syntax.AB.Assembly.xa\ 6502\ cross\ assembler :cal SetSyn("a65") an 50.10.490 &Syntax.AB.ASN\.1 :cal SetSyn("asn") an 50.10.500 &Syntax.AB.Asterisk\ config :cal SetSyn("asterisk") an 50.10.510 &Syntax.AB.Asterisk\ voicemail\ config :cal SetSyn("asteriskvm") @@ -303,7 +303,7 @@ an 50.50.710 &Syntax.HIJK.Kimwitu++ :cal SetSyn("kwt") an 50.50.720 &Syntax.HIJK.Kivy :cal SetSyn("kivy") an 50.50.730 &Syntax.HIJK.KixTart :cal SetSyn("kix") an 50.60.100 &Syntax.L.Lace :cal SetSyn("lace") -an 50.60.110 &Syntax.L.LamdaProlog :cal SetSyn("lprolog") +an 50.60.110 &Syntax.L.LambdaProlog :cal SetSyn("lprolog") an 50.60.120 &Syntax.L.Latte :cal SetSyn("latte") an 50.60.130 &Syntax.L.Ld\ script :cal SetSyn("ld") an 50.60.140 &Syntax.L.LDAP.LDIF :cal SetSyn("ldif") diff --git a/usr/share/vim/vim90/syntax/abap.vim b/usr/share/vim/vim90/syntax/abap.vim index e48dfc3603d..627e51504a3 100644 --- a/usr/share/vim/vim90/syntax/abap.vim +++ b/usr/share/vim/vim90/syntax/abap.vim @@ -122,7 +122,7 @@ syn keyword abapStatement TABLES TIMES TRANSFER TRANSLATE TRY TYPE TYPES syn keyword abapStatement UNASSIGN ULINE UNPACK UPDATE syn keyword abapStatement WHEN WHILE WINDOW WRITE -" More statemets +" More statements syn keyword abapStatement LINES syn keyword abapStatement INTO GROUP BY HAVING ORDER BY SINGLE syn keyword abapStatement APPENDING CORRESPONDING FIELDS OF TABLE diff --git a/usr/share/vim/vim90/syntax/asm68k.vim b/usr/share/vim/vim90/syntax/asm68k.vim index e13dfe63896..104887d0262 100644 --- a/usr/share/vim/vim90/syntax/asm68k.vim +++ b/usr/share/vim/vim90/syntax/asm68k.vim @@ -4,7 +4,7 @@ " Last change: 2001 May 01 " " This is incomplete. In particular, support for 68020 and -" up and 68851/68881 co-processors is partial or non-existant. +" up and 68851/68881 co-processors is partial or non-existent. " Feel free to contribute... " @@ -220,7 +220,7 @@ syn match asm68kOperator "<>" " inequality syn match asm68kOperator "=" " must be before other ops containing '=' syn match asm68kOperator ">=" syn match asm68kOperator "<=" -syn match asm68kOperator "==" " operand existance - used in macro definitions +syn match asm68kOperator "==" " operand existence - used in macro definitions " Condition code style operators syn match asm68kOperator "<[CV][CS]>" diff --git a/usr/share/vim/vim90/syntax/chill.vim b/usr/share/vim/vim90/syntax/chill.vim index f3c66c2b4d1..b95df68bc86 100644 --- a/usr/share/vim/vim90/syntax/chill.vim +++ b/usr/share/vim/vim90/syntax/chill.vim @@ -24,7 +24,7 @@ syn keyword chillLogical NOT not syn keyword chillRepeat while WHILE for FOR do DO od OD TO to syn keyword chillProcess START start STACKSIZE stacksize PRIORITY priority THIS this STOP stop syn keyword chillBlock PROC proc PROCESS process -syn keyword chillSignal RECEIVE receive SEND send NONPERSISTENT nonpersistent PERSISTENT peristent SET set EVER ever +syn keyword chillSignal RECEIVE receive SEND send NONPERSISTENT nonpersistent PERSISTENT persistent SET set EVER ever syn keyword chillTodo contained TODO FIXME XXX diff --git a/usr/share/vim/vim90/syntax/debcontrol.vim b/usr/share/vim/vim90/syntax/debcontrol.vim index c79b702f922..af78ebc3aed 100644 --- a/usr/share/vim/vim90/syntax/debcontrol.vim +++ b/usr/share/vim/vim90/syntax/debcontrol.vim @@ -22,7 +22,7 @@ syn iskeyword @,48-57,- " Everything that is not explicitly matched by the rules below syn match debcontrolElse "^.*$" -" Common seperators +" Common separators syn match debControlComma ",[ \t]*" syn match debControlSpace "[ \t]" diff --git a/usr/share/vim/vim90/syntax/json5.vim b/usr/share/vim/vim90/syntax/json5.vim new file mode 100644 index 00000000000..5b01d33aad7 --- /dev/null +++ b/usr/share/vim/vim90/syntax/json5.vim @@ -0,0 +1,73 @@ +" Vim syntax file +" Language: JSON5 +" Maintainer: Mazunki Hoksaas rolferen@gmail.com +" Previous Maintainer: Guten Ye +" Last Change: 2019 Apr 1 +" Version: vim9.0-1 +" URL: https://github.com/json5/json5 + +" Syntax setup +if exists('b:current_syntax') && b:current_syntax == 'json5' + finish +endif + +" Numbers +syn match json5Number "[-+]\=\%(0\|[1-9]\d*\)\%(\.\d*\)\=\%([eE][-+]\=\d\+\)\=" +syn match json5Number "[-+]\=\%(\.\d\+\)\%([eE][-+]\=\d\+\)\=" +syn match json5Number "[-+]\=0[xX]\x*" +syn match json5Number "[-+]\=Infinity\|NaN" + +" An integer part of 0 followed by other digits is not allowed +syn match json5NumError "[-+]\=0\d\(\d\|\.\)*" + +" A hexadecimal number cannot have a fractional part +syn match json5NumError "[-+]\=0x\x*\.\x*" + +" Strings +syn region json5String start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=json5Escape,@Spell +syn region json5String start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=json5Escape,@Spell + +" Escape sequences +syn match json5Escape "\\['\"\\bfnrtv]" contained +syn match json5Escape "\\u\x\{4}" contained + +" Boolean +syn keyword json5Boolean true false + +" Null +syn keyword json5Null null + +" Delimiters and Operators +syn match json5Delimiter "," +syn match json5Operator ":" + +" Braces +syn match json5Braces "[{}\[\]]" + +" Keys +syn match json5Key /@\?\%(\I\|\$\)\%(\i\|\$\)*\s*\ze::\@!/ contains=@Spell +syn match json5Key /"\([^"]\|\\"\)\{-}"\ze\s*:/ contains=json5Escape,@Spell + +" Comment +syn region json5LineComment start=+\/\/+ end=+$+ keepend contains=@Spell +syn region json5LineComment start=+^\s*\/\/+ skip=+\n\s*\/\/+ end=+$+ keepend fold contains=@Spell +syn region json5Comment start="/\*" end="\*/" fold contains=@Spell + +" Define the default highlighting +hi def link json5String String +hi def link json5Key Identifier +hi def link json5Escape Special +hi def link json5Number Number +hi def link json5Delimiter Delimiter +hi def link json5Operator Operator +hi def link json5Braces Delimiter +hi def link json5Null Keyword +hi def link json5Boolean Boolean +hi def link json5LineComment Comment +hi def link json5Comment Comment +hi def link json5NumError Error + +if !exists('b:current_syntax') + let b:current_syntax = 'json5' +endif + diff --git a/usr/share/vim/vim90/syntax/nix.vim b/usr/share/vim/vim90/syntax/nix.vim index 671b269c046..ef52cddf46d 100644 --- a/usr/share/vim/vim90/syntax/nix.vim +++ b/usr/share/vim/vim90/syntax/nix.vim @@ -99,7 +99,7 @@ syn match nixArgOperator '[a-zA-Z_][a-zA-Z0-9_'-]*\%(\s\|#.\{-\}\n\|\n\|/\*\_.\{ " " "\%(\s\|#.\{-\}\n\|\n\|/\*\_.\{-\}\*/\)*" " -" It is also used throught the whole file and is marked with 'v's as well. +" It is also used throughout the whole file and is marked with 'v's as well. " " Fortunately the matching rules for function arguments are much simpler than " for real attribute sets, because we can stop when we hit the first ellipsis or diff --git a/usr/share/vim/vim90/syntax/ora.vim b/usr/share/vim/vim90/syntax/ora.vim index 99034793f25..ab091a2eee4 100644 --- a/usr/share/vim/vim90/syntax/ora.vim +++ b/usr/share/vim/vim90/syntax/ora.vim @@ -449,7 +449,7 @@ hi def link oraString String "strings hi def link oraSpecial Special "special characters hi def link oraError Error "errors -hi def link oraParenError oraError "errors caused by mismatching parantheses +hi def link oraParenError oraError "errors caused by mismatching parentheses hi def link oraComment Comment "comments diff --git a/usr/share/vim/vim90/syntax/po.vim b/usr/share/vim/vim90/syntax/po.vim index 15d09b18bd5..08d6baec27d 100644 --- a/usr/share/vim/vim90/syntax/po.vim +++ b/usr/share/vim/vim90/syntax/po.vim @@ -42,7 +42,7 @@ syn match poHeaderItem "\(Project-Id-Version\|Report-Msgid-Bugs-To\|POT-Crea syn match poHeaderUndefined "\(PACKAGE VERSION\|YEAR-MO-DA HO:MI+ZONE\|FULL NAME \|LANGUAGE \|CHARSET\|ENCODING\|INTEGER\|EXPRESSION\)" contained syn match poCopyrightUnset "SOME DESCRIPTIVE TITLE\|FIRST AUTHOR , YEAR\|Copyright (C) YEAR Free Software Foundation, Inc\|YEAR THE PACKAGE\'S COPYRIGHT HOLDER\|PACKAGE" contained -" Translation comment block including: translator comment, automatic coments, flags and locations +" Translation comment block including: translator comment, automatic comments, flags and locations syn match poComment "^#.*$" syn keyword poFlagFuzzy fuzzy contained syn match poCommentTranslator "^# .*$" contains=poCopyrightUnset diff --git a/usr/share/vim/vim90/syntax/ppd.vim b/usr/share/vim/vim90/syntax/ppd.vim index da67e1f39ff..6bd57f34e5f 100644 --- a/usr/share/vim/vim90/syntax/ppd.vim +++ b/usr/share/vim/vim90/syntax/ppd.vim @@ -15,7 +15,7 @@ syn match ppdDefine "\*[a-zA-Z0-9\-_]\+:" syn match ppdUI "\*[a-zA-Z]*\(Open\|Close\)UI" syn match ppdUIGroup "\*[a-zA-Z]*\(Open\|Close\)Group" syn match ppdGUIText "/.*:" -syn match ppdContraints "^*UIConstraints:" +syn match ppdConstraints "^*UIConstraints:" " Define the default highlighting. " Only when an item doesn't have highlighting yet @@ -27,7 +27,7 @@ hi def link ppdUI Function hi def link ppdUIGroup Function hi def link ppdDef String hi def link ppdGUIText Type -hi def link ppdContraints Special +hi def link ppdConstraints Special let b:current_syntax = "ppd" diff --git a/usr/share/vim/vim90/syntax/spup.vim b/usr/share/vim/vim90/syntax/spup.vim index 9284abf63f7..222caa779e1 100644 --- a/usr/share/vim/vim90/syntax/spup.vim +++ b/usr/share/vim/vim90/syntax/spup.vim @@ -29,7 +29,7 @@ set cpo&vim "let strict_subsections = 1 " highlight types usually found in DECLARE section -if !exists("hightlight_types") +if !exists("highlight_types") let highlight_types = 1 endif diff --git a/usr/share/vim/vim90/syntax/tsscl.vim b/usr/share/vim/vim90/syntax/tsscl.vim index fd2a5e2ba95..df804b2f889 100644 --- a/usr/share/vim/vim90/syntax/tsscl.vim +++ b/usr/share/vim/vim90/syntax/tsscl.vim @@ -22,7 +22,7 @@ syn case ignore " " -" Begin syntax definitions for tss geomtery file. +" Begin syntax definitions for tss geometry file. " " Load TSS geometry syntax file diff --git a/usr/share/vim/vim90/syntax/zsh.vim b/usr/share/vim/vim90/syntax/zsh.vim index 69671c59ca8..084f8cdb41d 100644 --- a/usr/share/vim/vim90/syntax/zsh.vim +++ b/usr/share/vim/vim90/syntax/zsh.vim @@ -88,7 +88,7 @@ syn match zshOperator '||\|&&\|;\|&!\=' syn match zshRedir '\d\=\(<<<\|<&\s*[0-9p-]\=\|<>\?\)' " >, >>, and variants. syn match zshRedir '\d\=\(>&\s*[0-9p-]\=\|&>>\?\|>>\?&\?\)[|!]\=' - " | and |&, but only if it's not preceeded or + " | and |&, but only if it's not preceded or " followed by a | to avoid matching ||. syn match zshRedir '|\@1 diff --git a/var/lib/pacman/local/vim-9.0.2002-1/mtree b/var/lib/pacman/local/vim-9.0.2002-1/mtree deleted file mode 100644 index 1cb2bec39c0..00000000000 Binary files a/var/lib/pacman/local/vim-9.0.2002-1/mtree and /dev/null differ diff --git a/var/lib/pacman/local/vim-9.0.2002-1/desc b/var/lib/pacman/local/vim-9.0.2043-1/desc similarity index 78% rename from var/lib/pacman/local/vim-9.0.2002-1/desc rename to var/lib/pacman/local/vim-9.0.2043-1/desc index dd15f665a14..5cfc52c0489 100644 --- a/var/lib/pacman/local/vim-9.0.2002-1/desc +++ b/var/lib/pacman/local/vim-9.0.2043-1/desc @@ -2,7 +2,7 @@ vim %VERSION% -9.0.2002-1 +9.0.2043-1 %BASE% vim @@ -17,16 +17,16 @@ https://www.vim.org x86_64 %BUILDDATE% -1697101532 +1697701132 %INSTALLDATE% -1697253382 +1697771741 %PACKAGER% -CI (msys2/msys2-autobuild/a79a8c4c/6493533925) +CI (msys2/msys2-autobuild/e6700d20/6571322105) %SIZE% -58747300 +58790362 %GROUPS% editors diff --git a/var/lib/pacman/local/vim-9.0.2002-1/files b/var/lib/pacman/local/vim-9.0.2043-1/files similarity index 99% rename from var/lib/pacman/local/vim-9.0.2002-1/files rename to var/lib/pacman/local/vim-9.0.2043-1/files index 9e7eaed3c65..1f1688b5e6e 100644 --- a/var/lib/pacman/local/vim-9.0.2002-1/files +++ b/var/lib/pacman/local/vim-9.0.2043-1/files @@ -1850,6 +1850,7 @@ usr/share/vim/vim90/syntax/jgraph.vim usr/share/vim/vim90/syntax/jovial.vim usr/share/vim/vim90/syntax/jproperties.vim usr/share/vim/vim90/syntax/json.vim +usr/share/vim/vim90/syntax/json5.vim usr/share/vim/vim90/syntax/jsonc.vim usr/share/vim/vim90/syntax/jsp.vim usr/share/vim/vim90/syntax/julia.vim diff --git a/var/lib/pacman/local/vim-9.0.2043-1/mtree b/var/lib/pacman/local/vim-9.0.2043-1/mtree new file mode 100644 index 00000000000..509c3f37b20 Binary files /dev/null and b/var/lib/pacman/local/vim-9.0.2043-1/mtree differ diff --git a/var/lib/pacman/sync/clang32.db b/var/lib/pacman/sync/clang32.db index b0531e0795d..295f6c3ae63 100644 Binary files a/var/lib/pacman/sync/clang32.db and b/var/lib/pacman/sync/clang32.db differ diff --git a/var/lib/pacman/sync/clang32.db.sig b/var/lib/pacman/sync/clang32.db.sig index 6f8fa6e8d53..f22b23af783 100644 Binary files a/var/lib/pacman/sync/clang32.db.sig and b/var/lib/pacman/sync/clang32.db.sig differ diff --git a/var/lib/pacman/sync/clang64.db b/var/lib/pacman/sync/clang64.db index f768a9033f5..17fe60c6b85 100644 Binary files a/var/lib/pacman/sync/clang64.db and b/var/lib/pacman/sync/clang64.db differ diff --git a/var/lib/pacman/sync/clang64.db.sig b/var/lib/pacman/sync/clang64.db.sig index 526ee854e53..6b20e6c8fdf 100644 Binary files a/var/lib/pacman/sync/clang64.db.sig and b/var/lib/pacman/sync/clang64.db.sig differ diff --git a/var/lib/pacman/sync/clangarm64.db b/var/lib/pacman/sync/clangarm64.db index 64793d5daf7..11a376141d2 100644 Binary files a/var/lib/pacman/sync/clangarm64.db and b/var/lib/pacman/sync/clangarm64.db differ diff --git a/var/lib/pacman/sync/clangarm64.db.sig b/var/lib/pacman/sync/clangarm64.db.sig index 05710a78a63..7769177739c 100644 Binary files a/var/lib/pacman/sync/clangarm64.db.sig and b/var/lib/pacman/sync/clangarm64.db.sig differ diff --git a/var/lib/pacman/sync/mingw32.db b/var/lib/pacman/sync/mingw32.db index 4ae2528f57b..2c91fd84eb9 100644 Binary files a/var/lib/pacman/sync/mingw32.db and b/var/lib/pacman/sync/mingw32.db differ diff --git a/var/lib/pacman/sync/mingw32.db.sig b/var/lib/pacman/sync/mingw32.db.sig index d4ea6fc394b..47b5d43e249 100644 Binary files a/var/lib/pacman/sync/mingw32.db.sig and b/var/lib/pacman/sync/mingw32.db.sig differ diff --git a/var/lib/pacman/sync/mingw64.db b/var/lib/pacman/sync/mingw64.db index 8d78bf5a195..ca64007db08 100644 Binary files a/var/lib/pacman/sync/mingw64.db and b/var/lib/pacman/sync/mingw64.db differ diff --git a/var/lib/pacman/sync/mingw64.db.sig b/var/lib/pacman/sync/mingw64.db.sig index 066929ee697..8a0f81caabc 100644 Binary files a/var/lib/pacman/sync/mingw64.db.sig and b/var/lib/pacman/sync/mingw64.db.sig differ diff --git a/var/lib/pacman/sync/msys.db b/var/lib/pacman/sync/msys.db index 337f1c3c9e1..33c88806c14 100644 Binary files a/var/lib/pacman/sync/msys.db and b/var/lib/pacman/sync/msys.db differ diff --git a/var/lib/pacman/sync/msys.db.sig b/var/lib/pacman/sync/msys.db.sig index 0e289f6c0df..dbf494165c7 100644 Binary files a/var/lib/pacman/sync/msys.db.sig and b/var/lib/pacman/sync/msys.db.sig differ diff --git a/var/lib/pacman/sync/ucrt64.db b/var/lib/pacman/sync/ucrt64.db index 45e97ca3637..b4dea145ac6 100644 Binary files a/var/lib/pacman/sync/ucrt64.db and b/var/lib/pacman/sync/ucrt64.db differ diff --git a/var/lib/pacman/sync/ucrt64.db.sig b/var/lib/pacman/sync/ucrt64.db.sig index ccb830362e3..67ad8943ee0 100644 Binary files a/var/lib/pacman/sync/ucrt64.db.sig and b/var/lib/pacman/sync/ucrt64.db.sig differ