diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-04-17 16:31:09 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-04-17 16:31:09 +0200 |
commit | 56994d215815139207f3c5ce02a1720e44e93c09 (patch) | |
tree | 4a168880e92d7627c168fe7bfc6febc369af15a2 /runtime | |
parent | 112a006417a0d4700ff39ddba3bb5e985ae9770f (diff) |
Update runtime files.
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/compiler/cm3.vim | 26 | ||||
-rw-r--r-- | runtime/doc/options.txt | 2 | ||||
-rw-r--r-- | runtime/doc/tags | 5 | ||||
-rw-r--r-- | runtime/doc/todo.txt | 28 | ||||
-rw-r--r-- | runtime/doc/vim.1 | 4 | ||||
-rw-r--r-- | runtime/doc/vim.man | 4 | ||||
-rw-r--r-- | runtime/doc/vim9.txt | 5 | ||||
-rw-r--r-- | runtime/doc/windows.txt | 8 | ||||
-rw-r--r-- | runtime/filetype.vim | 2 | ||||
-rw-r--r-- | runtime/ftplugin/gprof.vim | 4 | ||||
-rw-r--r-- | runtime/ftplugin/m3build.vim | 24 | ||||
-rw-r--r-- | runtime/ftplugin/m3quake.vim | 33 | ||||
-rw-r--r-- | runtime/ftplugin/modula2.vim | 39 | ||||
-rw-r--r-- | runtime/ftplugin/modula3.vim | 38 | ||||
-rw-r--r-- | runtime/ftplugin/vim.vim | 10 | ||||
-rw-r--r-- | runtime/lang/menu_fr_fr.latin1.vim | 50 | ||||
-rw-r--r-- | runtime/plugin/matchparen.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/gprof.vim | 6 | ||||
-rw-r--r-- | runtime/syntax/hollywood.vim | 13 | ||||
-rw-r--r-- | runtime/syntax/m3build.vim | 177 | ||||
-rw-r--r-- | runtime/syntax/m3quake.vim | 74 | ||||
-rw-r--r-- | runtime/syntax/modula3.vim | 113 | ||||
-rw-r--r-- | runtime/syntax/psl.vim | 83 | ||||
-rw-r--r-- | runtime/syntax/ratpoison.vim | 22 | ||||
-rw-r--r-- | runtime/tutor/tutor.tr.utf-8 | 2 |
25 files changed, 676 insertions, 100 deletions
diff --git a/runtime/compiler/cm3.vim b/runtime/compiler/cm3.vim new file mode 100644 index 0000000000..3de51282e6 --- /dev/null +++ b/runtime/compiler/cm3.vim @@ -0,0 +1,26 @@ +" Vim compiler file +" Compiler: Critical Mass Modula-3 Compiler +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2021 Apr 08 + +if exists("current_compiler") + finish +endif +let current_compiler = "cm3" + +if exists(":CompilerSet") != 2 " older Vim always used :setlocal + command -nargs=* CompilerSet setlocal <args> +endif + +let s:cpo_save = &cpo +set cpo&vim + +" TODO: better handling of Quake errors +CompilerSet makeprg=cm3 +CompilerSet errorformat=%D---\ building\ in\ %f\ ---, + \%W\"%f\"\\,\ line\ %l:\ warning:\ %m, + \%E\"%f\"\\,\ line\ %l:\ %m, + \%-G%.%# + +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 5cb878a7b3..80bb235ae1 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 8.2. Last change: 2021 Apr 07 +*options.txt* For Vim version 8.2. Last change: 2021 Apr 16 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/tags b/runtime/doc/tags index b28f644e66..ddc4ce0218 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -3936,6 +3936,7 @@ E1050 vim9.txt /*E1050* E107 eval.txt /*E107* E108 eval.txt /*E108* E109 eval.txt /*E109* +E1091 vim9.txt /*E1091* E1092 vim9.txt /*E1092* E1094 vim9.txt /*E1094* E11 cmdline.txt /*E11* @@ -10144,8 +10145,10 @@ vim9-differences vim9.txt /*vim9-differences* vim9-export vim9.txt /*vim9-export* vim9-final vim9.txt /*vim9-final* vim9-gotchas vim9.txt /*vim9-gotchas* +vim9-ignored-argument vim9.txt /*vim9-ignored-argument* vim9-import vim9.txt /*vim9-import* vim9-lambda vim9.txt /*vim9-lambda* +vim9-lambda-arguments vim9.txt /*vim9-lambda-arguments* vim9-mix vim9.txt /*vim9-mix* vim9-namespace vim9.txt /*vim9-namespace* vim9-rationale vim9.txt /*vim9-rationale* @@ -10153,7 +10156,9 @@ vim9-reload vim9.txt /*vim9-reload* vim9-scopes vim9.txt /*vim9-scopes* vim9-script-intro usr_46.txt /*vim9-script-intro* vim9-types vim9.txt /*vim9-types* +vim9-unpack-ignore vim9.txt /*vim9-unpack-ignore* vim9-user-command vim9.txt /*vim9-user-command* +vim9-variable-arguments vim9.txt /*vim9-variable-arguments* vim9.txt vim9.txt /*vim9.txt* vim9script vim9.txt /*vim9script* vim: options.txt /*vim:* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 1a3f4cc57d..0a00f0ff8c 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 8.2. Last change: 2021 Apr 05 +*todo.txt* For Vim version 8.2. Last change: 2021 Apr 17 VIM REFERENCE MANUAL by Bram Moolenaar @@ -38,16 +38,19 @@ browser use: https://github.com/vim/vim/issues/1234 *known-bugs* -------------------- Known bugs and current work ----------------------- +make "skiprtp" also omit 'packpath'? + +- Implement blob index and slice assignment? + Make all of test_blob run in three ways + Vim9 - Make everything work: +- use CheckLegacyAndVim9Success(lines) in many more places - For builtin functions using tv_get_string*() use check_for_string() to be more strict about the argument type (not a bool). done: balloon_() - Check many more builtin function arguments at compile time. -- Using ".." at script level doesn't convert arguments to a string. -- This fails in a :def function but not at the script level: - var s = 'asdf'->((a) => a)('x') - Disallow passing more arguments to lambda than expected? -- Implement blob index and slice, also with assignment? + map() could check that the return type of the function argument matches + the type of the list or dict member. (#8092) - Compile replacement of :s command: s/pat/\=expr/ - Compile redir to local variable: var_redir_start(). - Implement type cast at the script level. @@ -61,6 +64,7 @@ Vim9 - Make everything work: - expandcmd() with `=expr` in filename uses legacy expression. - eval_expr() in ex_cexpr() - eval_expr() call in dbg_parsearg() and debuggy_find() +- compile_member() guesses the type, should figure out at runtime. - compile "skip" argument of searchpair() - compile "expr" and "call" expression of a channel in channel_exe_cmd()? - give an error for "echo Func()" if Func() does not return anything. @@ -126,6 +130,8 @@ Popup windows: - Add a termcap entry for changing the cursor when it goes under the popup and back. like t_SI and t_EI (t_SU and t_EU, where "U" means under?) - With terminal in popup, allow for popup_hide() to temporarily hide it.? +- Make it possible to scroll horizontally when 'wrap' is off. Does this + require an ascii scrollbar, like with the vertical one? - Fire some autocommand event after a new popup window was created and positioned? PopupNew? Could be used to set some options or move it out of the way. (#5737) @@ -495,6 +501,9 @@ Assuming the files are text, print the line with the difference. Result of synID() sometimes wrong in help files. (#5252) +When a help file is opened that doesn't have "ft=help" in the modeline then +the FileType is first set to "text" before it is set to "help". (#8099) + Problem showing a line if the number column width changes when using "o". (Mateusz Morusiewicz, #4245) @@ -1013,8 +1022,7 @@ for a path separator. (xtal8, #2201) Would be nice for Insert mode completion to highlight the text that was added (and may change when picking another completion). -Test runtime files. -Start with filetype detection: testdir/test_filetype.vim +Test more runtime files. Window not closed when deleting buffer. (Harm te Hennepe, 2017 Aug 27, #2029) @@ -1987,6 +1995,10 @@ Patch for :tabrecently. (Hirokazu Yoshida, 2012 Jan 30) Problem with "syn sync grouphere". (Gustavo Niemeyer, 2011 Jan 27) +Using "syn sync breaklines=2" works for when text is changed, but not when +scrolling or redrawing. Should start search for syntax patterns above the +first drawn line. (#8103) + Loading autoload script even when usage is inside "if 0". (Christian Brabandt, 2010 Dec 18) diff --git a/runtime/doc/vim.1 b/runtime/doc/vim.1 index f32c06785a..5bf0d05030 100644 --- a/runtime/doc/vim.1 +++ b/runtime/doc/vim.1 @@ -416,6 +416,10 @@ Denotes the end of the options. Arguments after this will be handled as a file name. This can be used to edit a filename that starts with a '\-'. .TP +\-\-clean +Do not use any personal configuration (vimrc, plugins, etc.). Useful to see if +a problem reproduces with a clean Vim setup. +.TP \-\-echo\-wid GTK GUI only: Echo the Window ID on stdout. .TP diff --git a/runtime/doc/vim.man b/runtime/doc/vim.man index 6ab20e9070..91f29e14e5 100644 --- a/runtime/doc/vim.man +++ b/runtime/doc/vim.man @@ -300,6 +300,10 @@ OPTIONS be handled as a file name. This can be used to edit a filename that starts with a '-'. + --clean Do not use any personal configuration (vimrc, plugins, + etc.). Useful to see if a problem reproduces with a clean + Vim setup. + --echo-wid GTK GUI only: Echo the Window ID on stdout. --help Give a help message and exit, just like "-h". diff --git a/runtime/doc/vim9.txt b/runtime/doc/vim9.txt index 6b676dfabd..0fc7bf5278 100644 --- a/runtime/doc/vim9.txt +++ b/runtime/doc/vim9.txt @@ -1,4 +1,4 @@ -*vim9.txt* For Vim version 8.2. Last change: 2021 Apr 06 +*vim9.txt* For Vim version 8.2. Last change: 2021 Apr 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -334,10 +334,11 @@ The "g:" prefix is not needed for auto-load functions. Since `&opt = value` is now assigning a value to option "opt", ":&" cannot be used to repeat a `:substitute` command. - + *vim9-unpack-ignore* For an unpack assignment the underscore can be used to ignore a list item, similar to how a function argument can be ignored: > [a, _, c] = theList +To ignore any remaining items: > [a, b; _] = longList < *E1092* diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt index b3905be9b4..d0d67f8002 100644 --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -1,4 +1,4 @@ -*windows.txt* For Vim version 8.2. Last change: 2021 Mar 21 +*windows.txt* For Vim version 8.2. Last change: 2021 Apr 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -521,14 +521,14 @@ CTRL-W J Move the current window to be at the very bottom, using the CTRL-W H Move the current window to be at the far left, using the full height of the screen. This works like closing the current window and then creating another one with - ":vert topleft split", except that the current window contents + `:vert topleft split`, except that the current window contents is used for the new window. *CTRL-W_L* CTRL-W L Move the current window to be at the far right, using the full height of the screen. This works like closing the current window and then creating another one with - ":vert botright split", except that the current window + `:vert botright split`, except that the current window contents is used for the new window. *CTRL-W_T* @@ -571,7 +571,7 @@ CTRL-W < Decrease current window width by N (default 1). *CTRL-W_>* CTRL-W > Increase current window width by N (default 1). -:vertical res[ize] [N] *:vertical-resize* *CTRL-W_bar* +:vert[ical] res[ize] [N] *:vertical-resize* *CTRL-W_bar* CTRL-W | Set current window width to N (default: widest possible). You can also resize a window by dragging a status line up or down with the diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 60f80d14f8..16f46f3b35 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2021 Apr 05 +" Last Change: 2021 Apr 17 " Listen very carefully, I will say this only once if exists("did_load_filetypes") diff --git a/runtime/ftplugin/gprof.vim b/runtime/ftplugin/gprof.vim index 750751c372..d4547ae9a6 100644 --- a/runtime/ftplugin/gprof.vim +++ b/runtime/ftplugin/gprof.vim @@ -1,6 +1,6 @@ " Language: gprof " Maintainer: Dominique Pelle <dominique.pelle@gmail.com> -" Last Change: 2013 Jun 09 +" Last Change: 2021 Apr 08 " When cursor is on one line of the gprof call graph, " calling this function jumps to this function in the call graph. @@ -16,7 +16,7 @@ fun! <SID>GprofJumpToFunctionIndex() norm! $y% call search('^' . escape(@", '[]'), 'sw') norm! zz - elseif l:line =~ '^\(\s\+[0-9\.]\+\)\{3}\s\+' + elseif l:line =~ '^\(\s*[0-9\.]\+\)\{3}\s\+' " We're in line in the flat profile. norm! 55|eby$ call search('^\[\d\+\].*\d\s\+' . escape(@", '[]*.') . '\>', 'sW') diff --git a/runtime/ftplugin/m3build.vim b/runtime/ftplugin/m3build.vim new file mode 100644 index 0000000000..9e1e169d38 --- /dev/null +++ b/runtime/ftplugin/m3build.vim @@ -0,0 +1,24 @@ +" Vim filetype plugin file +" Language: Modula-3 Makefile +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2021 April 15 + +if exists("b:did_ftplugin") + finish +endif +let b:did_ftplugin = 1 + +let s:cpo_save = &cpo +set cpo&vim + +runtime! ftplugin/m3quake.vim + +if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") + let b:browsefilter = "Modula-3 Makefile (m3makefile m3overrides)\tm3makefile;m3overrides\n" .. + \ "All Files (*.*)\t*.*\n" +endif + +let &cpo = s:cpo_save +unlet s:cpo_save + +" vim: nowrap sw=2 sts=2 ts=8 noet: diff --git a/runtime/ftplugin/m3quake.vim b/runtime/ftplugin/m3quake.vim new file mode 100644 index 0000000000..627aabdc3e --- /dev/null +++ b/runtime/ftplugin/m3quake.vim @@ -0,0 +1,33 @@ +" Vim filetype plugin file +" Language: Modula-3 Quake +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2021 April 15 + +if exists("b:did_ftplugin") + finish +endif +let b:did_ftplugin = 1 + +let s:cpo_save = &cpo +set cpo&vim + +setlocal comments=s1:/*,mb:*,ex:*/,:% +setlocal commentstring=%\ %s +setlocal formatoptions-=t formatoptions+=croql + +if exists("loaded_matchit") && !exists("b:match_words") + let b:match_words = '\<\%(proc\|if\|foreach\)\>:\<else\>:\<end\>' +endif + +if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") + let b:browsefilter = "Modula-3 Quake Source Files (*.quake)\t*.quake\n" .. + \ "All Files (*.*)\t*.*\n" +endif + +let b:undo_ftplugin = "setl fo< com< cms< " .. + \ "| unlet! b:browsefilter b:match_words" + +let &cpo = s:cpo_save +unlet s:cpo_save + +" vim: nowrap sw=2 sts=2 ts=8 noet: diff --git a/runtime/ftplugin/modula2.vim b/runtime/ftplugin/modula2.vim new file mode 100644 index 0000000000..1d0e81ee70 --- /dev/null +++ b/runtime/ftplugin/modula2.vim @@ -0,0 +1,39 @@ +" Vim filetype plugin file +" Language: Modula-2 +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2021 Apr 08 + +if exists("b:did_ftplugin") + finish +endif +let b:did_ftplugin = 1 + +let s:cpo_save = &cpo +set cpo&vim + +setlocal comments=s0:(*,mb:\ ,ex:*) +setlocal commentstring=(*%s*) +setlocal formatoptions-=t formatoptions+=croql + +if exists("loaded_matchit") && !exists("b:match_words") + " The second branch of the middle pattern is intended to match CASE labels + let b:match_words = '\<REPEAT\>:\<UNTIL\>,' .. + \ '\<\%(BEGIN\|CASE\|FOR\|IF\|LOOP\|WHILE\|WITH\)\>' .. + \ ':' .. + \ '\<\%(ELSIF\|ELSE\)\>\|\%(^\s*\)\@<=\w\+\%(\s*\,\s*\w\+\)\=\s*\:=\@!' .. + \ ':' .. + \ '\<END\>' +endif + +if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") + let b:browsefilter = "Modula-2 Source Files (*.def *.mod)\t*.def;*.mod\n" .. + \ "All Files (*.*)\t*.*\n" +endif + +let b:undo_ftplugin = "setl com< cms< fo< " .. + \ "| unlet! b:browsefilter b:match_words" + +let &cpo = s:cpo_save +unlet s:cpo_save + +" vim: nowrap sw=2 sts=2 ts=8 noet: diff --git a/runtime/ftplugin/modula3.vim b/runtime/ftplugin/modula3.vim new file mode 100644 index 0000000000..fc9eb57949 --- /dev/null +++ b/runtime/ftplugin/modula3.vim @@ -0,0 +1,38 @@ +" Vim filetype plugin file +" Language: Modula-3 +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2021 Apr 08 + +if exists("b:did_ftplugin") + finish +endif +let b:did_ftplugin = 1 + +let s:cpo_save = &cpo +set cpo&vim + +setlocal comments=s0:(*,mb:\ ,ex:*) +setlocal commentstring=(*%s*) +setlocal formatoptions-=t formatoptions+=croql + +if exists("loaded_matchit") && !exists("b:match_words") + let b:match_words = '\<REPEAT\>:\<UNTIL\>,' .. + \ '\<\%(BEGIN\|CASE\|FOR\|IF\|LOCK\|LOOP\|TRY\|TYPECASE\|WHILE\|WITH\)\>' .. + \ ':' .. + \ '\<\%(ELSIF\|ELSE\|EXCEPT\|FINALLY\)\>\|\%(^\s*\)\@<=\S.*=>' .. + \ ':' .. + \ '\<END\>' +endif + +if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") + let b:browsefilter = "Modula-3 Source Files (*.m3)\t*.m3\n" .. + \ "All Files (*.*)\t*.*\n" +endif + +let b:undo_ftplugin = "setl com< cms< fo< " .. + \ "| unlet! b:browsefilter b:match_words" + +let &cpo = s:cpo_save +unlet s:cpo_save + +" vim: nowrap sw=2 sts=2 ts=8 noet: diff --git a/runtime/ftplugin/vim.vim b/runtime/ftplugin/vim.vim index 746e80b22a..98c94ccfc9 100644 --- a/runtime/ftplugin/vim.vim +++ b/runtime/ftplugin/vim.vim @@ -1,7 +1,7 @@ " Vim filetype plugin " Language: Vim " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2021 Feb 20 +" Last Change: 2021 Apr 11 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -94,11 +94,11 @@ if exists("loaded_matchit") " func name " require a parenthesis following, then there can be an "endfunc". let b:match_words = - \ '\<\%(fu\%[nction]\|def\)!\=\s\+\S\+(:\<retu\%[rn]\>:\<\%(endf\%[unction]\|enddef\)\>,' . - \ '\<\(wh\%[ile]\|for\)\>:\<brea\%[k]\>:\<con\%[tinue]\>:\<end\(w\%[hile]\|fo\%[r]\)\>,' . - \ '\<if\>:\<el\%[seif]\>:\<en\%[dif]\>,' . + \ '\<\%(fu\%[nction]\|def\)!\=\s\+\S\+(:\%(\%(^\||\)\s*\)\@<=\<retu\%[rn]\>:\%(\%(^\||\)\s*\)\@<=\<\%(endf\%[unction]\|enddef\)\>,' . + \ '\<\(wh\%[ile]\|for\)\>:\%(\%(^\||\)\s*\)\@<=\<brea\%[k]\>:\%(\%(^\||\)\s*\)\@<=\<con\%[tinue]\>:\%(\%(^\||\)\s*\)\@<=\<end\(w\%[hile]\|fo\%[r]\)\>,' . + \ '\<if\>:\%(\%(^\||\)\s*\)\@<=\<el\%[seif]\>:\%(\%(^\||\)\s*\)\@<=\<en\%[dif]\>,' . \ '{:},' . - \ '\<try\>:\<cat\%[ch]\>:\<fina\%[lly]\>:\<endt\%[ry]\>,' . + \ '\<try\>:\%(\%(^\||\)\s*\)\@<=\<cat\%[ch]\>:\%(\%(^\||\)\s*\)\@<=\<fina\%[lly]\>:\%(\%(^\||\)\s*\)\@<=\<endt\%[ry]\>,' . \ '\<aug\%[roup]\s\+\%(END\>\)\@!\S:\<aug\%[roup]\s\+END\>,' " Ignore syntax region commands and settings, any 'en*' would clobber " if-endif. diff --git a/runtime/lang/menu_fr_fr.latin1.vim b/runtime/lang/menu_fr_fr.latin1.vim index 940bd96545..bd045d7ecb 100644 --- a/runtime/lang/menu_fr_fr.latin1.vim +++ b/runtime/lang/menu_fr_fr.latin1.vim @@ -1,8 +1,9 @@ " Menu Translations: Francais " Maintainer: Adrien Beau <version.francaise@free.fr> " First Version: Francois Thunus <thunus@systran.fr> -" Last Modification: David Blanchet <david.blanchet@free.fr> -" Last Change: 2018 Apr 25 +" Contributors: David Blanchet <david.blanchet@free.fr> +" Gabriel Dupras <gabrieldupras@gmail.com> +" Last Change: 2021 Feb 16 " Quit when menu translations have already been done. if exists("did_menu_trans") @@ -78,11 +79,12 @@ menutrans Find\ and\ Rep&lace<Tab>:%s Re&mplacer<Tab>:%s menutrans Find\ and\ Rep&lace<Tab>:s Re&mplacer<Tab>:s " -SEP3- menutrans Settings\ &Window Fe&nêtre\ des\ réglages +menutrans Startup\ &Settings Réglages\ de\ &lancement menutrans &Global\ Settings Réglages\ globau&x -menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! &Surligner\ recherche\ on/off<Tab>:set\ hls! -menutrans Toggle\ &Ignore-case<Tab>:set\ ic! &Ignorer\ casse\ on/off<Tab>:set\ ic! -menutrans Toggle\ &Showmatch<Tab>:set\ sm! Vérifier\ parenth&èses\ on/off<Tab>:set\ sm! +menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! &Surligner\ recherche\ on/off<Tab>:set\ hls! +menutrans Toggle\ &Ignoring\ case<Tab>:set\ ic! &Ignorer\ casse\ on/off<Tab>:set\ ic! +menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! Vérifier\ parenth&èses\ on/off<Tab>:set\ sm! menutrans &Context\ lines Lignes\ &autour\ du\ curseur @@ -94,7 +96,7 @@ menutrans Block\ and\ Insert &Bloc\ et\ insertion menutrans Always &Toujours menutrans Toggle\ Insert\ &Mode<Tab>:set\ im! I&nsertion\ permanente\ on/off<Tab>:set\ im! -menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp! &Compatibilité\ Vi\ on/off<Tab>:set\ cp! +menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp! &Compatibilité\ Vi\ on/off<Tab>:set\ cp! menutrans Search\ &Path\.\.\. Chemin\ de\ rec&herche\ des\ fichiers\.\.\. menutrans Ta&g\ Files\.\.\. Fichiers\ d'&étiquettes\.\.\. " -SEP1- @@ -109,12 +111,13 @@ let g:menutrans_tags_dialog = "Entrez les noms des fichiers d'étiquettes.\nSépar menutrans F&ile\ Settings Réglages\ fichie&r menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu! &Numérotation\ on/off<Tab>:set\ nu! +menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu! &Numérotation\ relative\ on/off<Tab>:set\ nu! menutrans Toggle\ &List\ Mode<Tab>:set\ list! Mode\ &listing\ on/off<Tab>:set\ list! -menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap! &Retour\ à\ la\ ligne\ on/off<Tab>:set\ wrap! -menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr! Retour\ sur\ &mot\ on/off<Tab>:set\ lbr! -menutrans Toggle\ &expand-tab<Tab>:set\ et! &Tab\.\ en\ espaces\ on/off<Tab>:set\ et! -menutrans Toggle\ &auto-indent<Tab>:set\ ai! Indentation\ &auto\.\ on/off<Tab>:set\ ai! -menutrans Toggle\ &C-indenting<Tab>:set\ cin! Indent\.\ langage\ &C\ on/off<Tab>:set\ cin! +menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap! &Retour\ à\ la\ ligne\ on/off<Tab>:set\ wrap! +menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr! Retour\ sur\ &mot\ on/off<Tab>:set\ lbr! +menutrans Toggle\ Tab\ &Expanding<Tab>:set\ et! &Tab\.\ en\ espaces\ on/off<Tab>:set\ et! +menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai! Indentation\ &auto\.\ on/off<Tab>:set\ ai! +menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin! Indent\.\ langage\ &C\ on/off<Tab>:set\ cin! " -SEP2- menutrans &Shiftwidth Largeur\ des\ in&dentations menutrans Soft\ &Tabstop &Pseudo-tabulations @@ -126,7 +129,9 @@ let g:menutrans_fileformat_dialog = "Choisissez le format dans lequel écrire le let g:menutrans_fileformat_choices = " &Unix \n &Dos \n &Mac \n &Annuler " menutrans C&olor\ Scheme &Jeu\ de\ couleurs +menutrans Show\ C&olor\ Schemes\ in\ Menu Afficher\ les\ &jeux\ de\ couleurs menutrans &Keymap &Type\ de\ clavier +menutrans Show\ &Keymaps\ in\ Menu Afficher\ les\ &types\ de\ clavier menutrans None (aucun) menutrans Select\ Fo&nt\.\.\. Sélectionner\ &police\.\.\. @@ -146,16 +151,17 @@ menutrans To\ &Previous\ error<Tab>[s À\ l'erreur\ &précédente<Tab>[s menutrans Suggest\ &Corrections<Tab>z= Suggérer\ &correction<Tab>z= menutrans &Repeat\ correction<Tab>:spellrepall &Reporter\ la\ correction<Tab>:spellrepall -an 40.335.205 &Tools.&Spelling.Français\ (fr) :set spl=fr spell<CR> -menutrans Set\ language\ to\ "en" Anglais -menutrans Set\ language\ to\ "en_au" Anglais\ (en_au) -menutrans Set\ language\ to\ "en_ca" Anglais\ (en_ca) -menutrans Set\ language\ to\ "en_gb" Anglais\ (en_gb) -menutrans Set\ language\ to\ "en_nz" Anglais\ (en_nz) -menutrans Set\ language\ to\ "en_us" Anglais\ (en_us) +an 40.335.205 &Tools.&Spelling.Dictionnaire\ &français\ (fr) :set spl=fr spell<CR> +menutrans Set\ language\ to\ "en" Dictionnaire\ &anglais\ (en) +menutrans Set\ language\ to\ "en_au" Dictionnaire\ anglais\ (en_au) +menutrans Set\ language\ to\ "en_ca" Dictionnaire\ anglais\ (en_ca) +menutrans Set\ language\ to\ "en_gb" Dictionnaire\ anglais\ (en_gb) +menutrans Set\ language\ to\ "en_nz" Dictionnaire\ anglais\ (en_nz) +menutrans Set\ language\ to\ "en_us" Dictionnaire\ anglais\ (en_us) menutrans &Find\ More\ Languages &Trouver\ d'autres\ langues +let g:menutrans_set_lang_to = "Dictionnaire " menutrans &Folding &Replis @@ -211,6 +217,7 @@ menutrans &Convert\ to\ HEX<Tab>:%!xxd Convertir\ en\ he&xa<Tab>:%!xxd menutrans Conve&rt\ back<Tab>:%!xxd\ -r Décon&vertir<Tab>:%!xxd\ -r menutrans Se&T\ Compiler &Type\ de\ compilateur +menutrans Show\ Compiler\ Se&ttings\ in\ Menu &Afficher\ les\ compilateurs menutrans &Buffers &Tampons @@ -268,10 +275,15 @@ menutrans &Delete &Effacer " -SEP2- menutrans Select\ Blockwise Sélectionner\ &bloc menutrans Select\ &Word Sélectionner\ &mot +menutrans Select\ &Sentence Sélectionner\ &phrase +menutrans Select\ Pa&ragraph Sélectionner\ pa&ragraphe menutrans Select\ &Line Sélectionner\ &ligne menutrans Select\ &Block Sélectionner\ &bloc menutrans Select\ &All Sélectionner\ &tout +let g:menutrans_spell_change_ARG_to = 'Remplacer\ "%s"\ par' +let g:menutrans_spell_add_ARG_to_word_list = 'Ajouter\ "%s"\ au\ dictionnaire' +let g:menutrans_spell_ignore_ARG = 'Ignorer\ "%s"' " ToolBar @@ -459,7 +471,7 @@ menutrans XXD\ hex\ dump Sortie\ hexa\.\ de\ xxd menutrans XFree86\ Config Config\.\ XFree86 " The End Of The Syntax Menu -menutrans &Show\ filetypes\ in\ menu &Afficher\ tout\ le\ menu +menutrans &Show\ file\ types\ in\ menu &Afficher\ tout\ le\ menu " -SEP1- menutrans Set\ '&syntax'\ only Changer\ '&syntax'\ seulement menutrans Set\ '&filetype'\ too Changer\ '&filetype'\ aussi diff --git a/runtime/plugin/matchparen.vim b/runtime/plugin/matchparen.vim index 0dad0ac0ea..cc4f38f669 100644 --- a/runtime/plugin/matchparen.vim +++ b/runtime/plugin/matchparen.vim @@ -1,6 +1,6 @@ " Vim plugin for showing matching parens " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2021 Apr 07 +" Last Change: 2021 Apr 08 " Exit quickly when: " - this plugin was already loaded (or disabled) @@ -110,7 +110,7 @@ func s:Highlight_Matching_Pair() " We match "escape" for special items, such as lispEscapeSpecial, and " match "symbol" for lispBarSymbol. let s_skip = '!empty(filter(map(synstack(line("."), col(".")), ''synIDattr(v:val, "name")''), ' . - \ '''v:val =~? "string\\|character\\|singlequote\\|escape\\symbol\\|comment"''))' + \ '''v:val =~? "string\\|character\\|singlequote\\|escape\\|symbol\\|comment"''))' " If executing the expression determines that the cursor is currently in " one of the syntax types, then we want searchpairpos() to find the pair " within those syntax types (i.e., not skip). Otherwise, the cursor is diff --git a/runtime/syntax/gprof.vim b/runtime/syntax/gprof.vim index 381a3c63b0..880452a84b 100644 --- a/runtime/syntax/gprof.vim +++ b/runtime/syntax/gprof.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Syntax for Gprof Output " Maintainer: Dominique Pelle <dominique.pelle@gmail.com> -" Last Change: 2013 Jun 09 +" Last Change: 2021 Apr 08 " Quit when a syntax file was already loaded if exists("b:current_syntax") @@ -28,7 +28,7 @@ syn match gprofCallGraphTitle "Call graph (explanation follows)" syn region gprofCallGraphHeader \ start="^granularity: each sample hit covers.*" \ end="^\s*index % time\s\+self\s\+children\s\+called\s\+name$" -syn match gprofCallGraphFunction "\s\+\(\d\+\.\d\+\s\+\)\{3}\([0-9+]\+\)\?\s\+[a-zA-Z_<].*\ze\[" +syn match gprofCallGraphFunction "\<\(\d\+\.\d\+\s\+\)\{3}\([0-9+]\+\)\?\s\+[a-zA-Z_<].*\ze\[" syn match gprofCallGraphSeparator "^-\+$" syn region gprofCallGraphTrailer \ start="This table describes the call tree of the program" @@ -41,7 +41,7 @@ syn region gprofIndex syn match gprofIndexFunctionTitle "^Index by function name$" -syn match gprofNumbers "^\s\+[0-9 ./+]\+" +syn match gprofNumbers "^\s*[0-9 ./+]\+" syn match gprofFunctionIndex "\[\d\+\]" syn match gprofSpecial "<\(spontaneous\|cycle \d\+\)>" diff --git a/runtime/syntax/hollywood.vim b/runtime/syntax/hollywood.vim index 34fbb45c54..ce5ba29553 100644 --- a/runtime/syntax/hollywood.vim +++ b/runtime/syntax/hollywood.vim @@ -1,8 +1,8 @@ " Vim syntax file -" Language: Hollywood 8.0 +" Language: Hollywood 9.0 " Maintainer: Tom Crecelius <holly@net-eclipse.net> " First Author: Tom Crecelius <holly@net-eclipse.net> -" Last Change: 2018 May 18 +" Last Change: 2021 April 13 " Highlighting Issues: " Depending on your colour schema, Strings or Comments might be highlighted in " a way, you don't like. If so, try one of the following settings after @@ -30,7 +30,7 @@ let s:cpo_save = &cpo set cpo&vim if !exists("hw_version") - let hw_version = 8 + let hw_version = 9 let hw_subversion = 0 elseif !exists("hw_subversion") let hw_subversion = 0 @@ -109,12 +109,11 @@ syn match hwOperator "\%(&\|\*\|+\|-\|\.\||\|//\|/\|:\|<\|=\|>\|<>\|<=\|=>\|\^\| syn keyword hwConstant Nil syn keyword hwConstant True False " predefined preprocessing commands -syn match hwPreProcessor "@\<\%(BGPIC\|BRUSH\|ANIM\|SPRITE\|SAMPLE\|MUSIC\|FILE\|FONT\|VIDEO\|VERSION\|APPTITLE\|APPAUTHOR\|APPCOPYRIGHT\|APPDESCRIPTION\|APPVERSION\|APPICON\|BACKFILL\|SCREEN\|DISPLAY\|INCLUDE\|OPTIONS\|REQUIRE\|MENU\|APPIDENTIFIER\|WARNING\|ERROR\|IF\|ELSEIF\|ELSE\|ENDIF\)\>"ms=s+1 +syn match hwPreProcessor "@\<\%(ANIM\|APPAUTHOR\|APPCOPYRIGHT\|APPDESCRIPTION\|APPICON\|APPIDENTIFIER\|APPTITLE\|APPVERSION\|BACKFILL\|BGPIC\|BRUSH\|CATALOG\|DIRECTORY\|DISPLAY\|ELSE\|ELSEIF\|ENDIF\|ERROR\|FILE\|FONT\|ICON\|IF\|INCLUDE\|LINKER\|MENU\|MUSIC\|OPTIONS\|PALETTE\|REQUIRE\|SAMPLE\|SCREEN\|SPRITE\|VERSION\|VIDEO\|WARNING\)\>"ms=s+1 " predefined constants -syn match hwConstant "#\<\%(ERR_PORTNOTAVAIL\|SEEK_END\|ERR_CREATESHORTCUT\|PURPLE\|ERR_ALLOCCHANNEL\|PRGTYPE_SCRIPT\|ERR_NORETVAL\|ERR_DDRECVIDEO\|ERR_FINDPATH\|LANGUAGE_RUNDI\|ERR_STRINGCST\|COUNTRY_COLOMBIA\|LANGUAGE_KOREAN\|ERR_USERABORT\|ERR_WENDWOWHILE\|FONT\|FILEATTR_WRITE_OTH\|ERR_MODIFYABGPIC\|COUNTRY_DRCONGO\|LANGUAGE_KIRGHIZ\|LANGUAGE_ROMANSH\|FILEATTR_EXECUTE_GRP\|ERR_READVIDEOPIXELS\|SCROLLTOP\|ERR_ANIMDISK\|COUNTRY_IVORYCOAST\|LANGUAGE_GUJARATI\|SHORT\|COUNTRY_SOUTHAFRICA\|VIDEO\|ERR_BLKWOENDBLK\|ERR_WRONGHEX\|SPRITE_VS_BRUSH\|LANGUAGE_HIRIMOTU\|ZOOMSOUTHEAST\|COUNTRY_SLOVAKIA\|COUNTRY_GIBRALTAR\|ERR_INVALIDDATE\|RTS_ON\|PIXELZOOM1\|ATTRFRAMEDELAY\|AQUA\|ATTRFONTSCALABLE\|FILEATTR_NORMAL\|COUNTRY_ALBANIA\|COUNTRY_JAMAICA\|FONTWEIGHT_MEDIUM\|ERR_MALFORMPAT1\|COUNTRY_FRENCHGUIANA\|ERR_MAXPARAMS\|ERR_FORWONEXT\|COUNTRY_CONGO\|COUNTRY_GAMBIA\|UPNDOWN\|COUNTRY_ANDORRA\|BRUSH\|ERR_SELECTALPHACHANNEL\|MODLCOMMAND\|CLIENT\|COUNTRY_TRINIDADANDTOBAGO\|DIRECTORY\|LANGUAGE_ESPERANTO\|ATTRRAWHEIGHT\|COUNTRY_DENMARK\|FILETYPE_SOUND\|CLIPBOARD_TEXT\|LANGUAGE_FULAH\|ATTRPOSITION\|PLUGINCAPS_CONVERT\|ERR_APPLETVERSION\|COUNTRY_VANUATU\|COUNTDIRECTORIES\|ATTRNOHIDE\|VSTRIPES64\|AMIGAICON_SETPOSITION\|PUSHBOTTOM\|ERR_BACKFILL\|COUNTRY_MOROCCO\|ERR_FILEFORMAT\|COUNTRY_CHILE\|ATTRHOSTSCALEY\|ERR_AHI\|HW_VERSION\|ERR_ALRDYDECLRD\|ATTRRAWWIDTH\|ERR_PIXELFORMAT\|IMGFMT_PLUGIN\|LANGUAGE_HEBREW\|ERR_SETMENU\|ERR_NOLAYERS\|CRUSHTOP\|ERR_MAXLINES\|ATTRHASMASK\|LEFT\|ERR_SELECTANIM\|WALLPAPERLEFT\|TEXTOBJECT\|ERR_AFILEPROP\|LANGUAGE_CZECH\|LANGUAGE_XHOSA\|ERR_PIPE\|LANGUAGE_MANX\|ERR_EXECUTE\|ERR_ENDDOUBLEBUFFER\|ATTRGROUP\|ERR_NAMETOOLONG\|ATTRBORDERRIGHT\|COUNTRY_BOSNIAANDHERZEGOVINA\|ATTRMARGINRIGHT\|RTS_OFF\|LANGUAGE_MARSHALLESE\|LANGUAGE_AZERBAIJANI\|LANGUAGE_TAHITIAN\|JOINMITER\|ATTRNOCLOSE\|REQICON_WARNING\|ERR_NOTPROTRACKER\|LANGUAGE_LAO\|ERR_EMPTYPATH\|ERR_NOCALLBACK\|COUNTRY_UGANDA\|ERR_READFUNC\|IMGFMT_UNKNOWN\|ADF_ANIM\|ERR_LAYERSWITCH\|ERR_RECVCLOSED\|ERR_CTRLSTRUCT\|ERR_TABLEOVERFLOW\|SCROLLBOTTOM\|VSTRIPES\|ERR_VAREXPECTED\|ERR_NOTIGER\|BEEPSYSTEM\|ERR_LOWFREQ\|COUNTFILES\|COUNTRY_MONACO\|BLUE\|ERR_VFONT\|STRUDEL\|REQ_GALLERY\|ERR_NOCOORDCST\|MENU\|HSTRIPES64\|COUNTRY_COCOSISLANDS\|LANGUAGE_SOUTHNDEBELE\|COUNTRY_FALKLANDISLANDS\|COUNTRY_UAE\|LANGUAGE_KANNADA\|ERR_VIDRECMULTI\|FILETYPE_VIDEO\|LANGUAGE_ESTONIAN\|COUNTRY_CAYMANISLANDS\|ERR_BADINTEGER\|MONO16\|COUNTRY_CAMEROON\|COUNTRY_GUAM\|ERR_DISPLAYDESKTOP\|ERR_SETENV\|ERR_INTERNAL\|MASKVISIBLE\|ERR_OPENFONT\|LANGUAGE_WELSH\|ATTRRAWXPOS\|LANGUAGE_THAI\|ATTRHOSTMONITORS\|LANGUAGE_GALICIAN\|COUNTRY_GUATEMALA\|ATTRYPOS\|COUNTRY_UZBEKISTAN\|ERR_ELSEIFAFTERELSE\|MODRCONTROL\|BAUD_4800\|JOYDOWNRIGHT\|COUNTRY_LUXEMBOURG\|COUNTRY_MOZAMBIQUE\|ERR_PAKFORMAT\|LANGUAGE_TAJIK\|LANGUAGE_PANJABI\|ERR_MISSINGFIELD\|PLUGINCAPS_LIBRARY\|ERR_FUNCARGS\|LANGUAGE_MALAY\|COUNTRY_PORTUGAL\|COUNTRY_JAPAN\|ERR_ICONPARMS\|COUNTRY_NEWCALEDONIA\|REMOVELAYER\|MOVEWINDOW\|ATTRFONTASCENDER\|PLUGINCAPS_DIRADAPTER\|ERR_VARLENGTH\|ATTRSIZEABLE\|ERR_SENDUNKNOWN\|MENUITEM_RADIO\|COUNTRY_BELIZE\|ERR_LABELDOUBLE\|QUADRECT\|VBLINDS8\|ERR_UNKNOWNCMD\|SCROLLEAST\|ONBUTTONCLICKALL\|RECTNORTHEAST\|FONTWEIGHT_EXTRABOLD\|COUNTRY_SAINTKITTSANDNEVIS\|ERR_CLOSEDDISPLAY\|PLUGINCAPS_SAVEANIM\|ERR_WINDOW\|LANGUAGE_ZHUANG\|CAPROUND\|ERR_OUTOFRANGE\|REQ_CAMERA\|ERR_WARPOS\|COUNTRY_ELSALVADOR\|ERR_GROUPNAMEUSED\|COUNTRY_GUYANA\|ERR_ALREADYASYNC\|COUNTRY_PALESTINE\|DISPMODE_FAKEFULLSCREEN\|ERR_SYNTAXLEVELS\|ERR_BADPLATFORM\|ERR_VERSION\|ATTRVISIBLE\|HSTRETCHCENTER\|COUNTRY_REUNION\|COUNTRY_INDIA\|STRETCHLEFT\|ERR_ZERODIVISION\|LANG |