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 | |
parent | 112a006417a0d4700ff39ddba3bb5e985ae9770f (diff) |
Update runtime files.
29 files changed, 761 insertions, 170 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 79b62e93e9..94491d5657 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -22,6 +22,7 @@ runtime/autoload/vimball.vim @cecamp runtime/autoload/xmlformat.vim @chrisbra runtime/autoload/zip.vim @cecamp runtime/compiler/checkstyle.vim @dkearns +runtime/compiler/cm3.vim @dkearns runtime/compiler/cucumber.vim @tpope runtime/compiler/dart.vim @dkearns runtime/compiler/dart2js.vim @dkearns @@ -90,8 +91,11 @@ runtime/ftplugin/javascript.vim @dkearns runtime/ftplugin/javascriptreact.vim @dkearns runtime/ftplugin/kconfig.vim @chrisbra runtime/ftplugin/liquid.vim @tpope +runtime/ftplugin/m3build.vim @dkearns +runtime/ftplugin/m3quake.vim @dkearns runtime/ftplugin/markdown.vim @tpope runtime/ftplugin/matlab.vim @cecamp +runtime/ftplugin/modula3.vim @dkearns runtime/ftplugin/nroff.vim @a-vrma runtime/ftplugin/nsis.vim @k-takata runtime/ftplugin/pdf.vim @tpope @@ -167,10 +171,13 @@ runtime/syntax/lex.vim @cecamp runtime/syntax/liquid.vim @tpope runtime/syntax/lisp.vim @cecamp runtime/syntax/lynx.vim @dkearns +runtime/syntax/m3build.vim @dkearns +runtime/syntax/m3quake.vim @dkearns runtime/syntax/mailcap.vim @dkearns runtime/syntax/make.vim @rohieb runtime/syntax/maple.vim @cecamp runtime/syntax/markdown.vim @tpope +runtime/syntax/modula3.vim @dkearns runtime/syntax/netrw.vim @cecamp runtime/syntax/nroff.vim @jmarshall runtime/syntax/nsis.vim @k-takata @@ -7,12 +7,14 @@ ## What is Vim? ## -Vim is a greatly improved version of the good old UNIX editor Vi. Many new +Vim is a greatly improved version of the good old UNIX editor +[Vi](https://en.wikipedia.org/wiki/Vi). Many new features have been added: multi-level undo, syntax highlighting, command line history, on-line help, spell checking, filename completion, block operations, script language, etc. There is also a Graphical User Interface (GUI) available. Still, Vi compatibility is maintained, those who have Vi "in the -fingers" will feel at home. See `runtime/doc/vi_diff.txt` for differences with +fingers" will feel at home. +See [`runtime/doc/vi_diff.txt`](runtime/doc/vi_diff.txt) for differences with Vi. This editor is very useful for editing programs and other plain text files. @@ -42,7 +44,7 @@ want or must compile it yourself. Check http://www.vim.org/download.php for an overview of currently available distributions. Some popular places to get the latest Vim: -* Check out the git repository from [github](https://github.com/vim/vim). +* Check out the git repository from [GitHub](https://github.com/vim/vim). * Get the source code as an [archive](https://github.com/vim/vim/releases). * Get a Windows executable from the [vim-win32-installer](https://github.com/vim/vim-win32-installer/releases) repository. @@ -53,14 +55,14 @@ Some popular places to get the latest Vim: If you obtained a binary distribution you don't need to compile Vim. If you obtained a source distribution, all the stuff for compiling Vim is in the -`src` directory. See `src/INSTALL` for instructions. +[`src`](/src) directory. See [`src/INSTALL`](src/INSTALL) for instructions. ## Installation ## See one of these files for system-specific instructions. Either in the -READMEdir directory (in the repository) or the top directory (if you unpack an -archive): +[READMEdir directory](./READMEdir/) (in the repository) or +the top directory (if you unpack an archive): README_ami.txt Amiga README_unix.txt Unix @@ -78,8 +80,9 @@ The Vim tutor is a one hour training course for beginners. Often it can be started as `vimtutor`. See `:help tutor` for more information. The best is to use `:help` in Vim. If you don't have an executable yet, read -`runtime/doc/help.txt`. It contains pointers to the other documentation -files. The User Manual reads like a book and is recommended to learn to use +[`runtime/doc/help.txt`](/runtime/doc/help.txt). +It contains pointers to the other documentation files. +The User Manual reads like a book and is recommended to learn to use Vim. See `:help user-manual`. @@ -87,7 +90,8 @@ Vim. See `:help user-manual`. Vim is Charityware. You can use and copy it as much as you like, but you are encouraged to make a donation to help orphans in Uganda. Please read the file -`runtime/doc/uganda.txt` for details (do `:help uganda` inside Vim). +[`runtime/doc/uganda.txt`](runtime/doc/uganda.txt) +for details (do `:help uganda` inside Vim). Summary of the license: There are no restrictions on using or distributing an unmodified copy of Vim. Parts of Vim may also be distributed, but the license @@ -103,8 +107,8 @@ your appreciation for the work and motivate Bram and others to continue working on Vim please send a donation. Since Bram is back to a paid job the money will now be used to help children -in Uganda. See `runtime/doc/uganda.txt`. But at the same time donations -increase Bram's motivation to keep working on Vim! +in Uganda. See [`runtime/doc/uganda.txt`](runtime/doc/uganda.txt). But +at the same time donations increase Bram's motivation to keep working on Vim! For the most recent information about sponsoring look on the Vim web site: http://www.vim.org/sponsor/ @@ -112,7 +116,8 @@ For the most recent information about sponsoring look on the Vim web site: ## Contributing ## -If you would like to help making Vim better, see the [CONTRIBUTING.md](https://github.com/vim/vim/blob/master/CONTRIBUTING.md) file. +If you would like to help making Vim better, see the +[CONTRIBUTING.md](/CONTRIBUTING.md) file. ## Information ## diff --git a/READMEdir/README_mac.txt b/READMEdir/README_mac.txt index 22671c22b0..4edd55cd38 100644 --- a/READMEdir/README_mac.txt +++ b/READMEdir/README_mac.txt @@ -1,28 +1,12 @@ README_mac.txt for version 8.2 of Vim: Vi IMproved. -This file explains the installation of Vim on Macintosh systems. +This file explains the installation of Vim on MacOS systems. See "README.txt" for general information about Vim. +To build from source get the files with git from https://github.com/vim/vim. +The find the instructions in src/INSTALLmac.txt. -To build from sources, like on Unix - -1. Get the build tools: "clang" and "make". These can be installed with the - "CommandLineTools" package. If you don't have one, do - xcode-select --install - Just like for any software development with OS X. - -2. Get the source code. Best is to use git (which you need to install first), - see http://www.vim.org/git.php - Or you can download and unpack the Unix tar archive, see - http://www.vim.org/download.php - -3. Go to the top directory of the source tree, do - make - sudo make install - A newly built vim will be installed under "/usr/local". - - -If you can't manage to make this work, there is a fallback using Homebrew: - +Installing Vim using Homebrew: 1. Install Homebrew from http://brew.sh/ -2. Install latest Vim with: brew install vim +2. Install the latest Vim with: + brew install vim 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 |