diff options
author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-05-02 11:52:52 -0400 |
---|---|---|
committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-05-02 12:03:34 -0400 |
commit | abb13dde980b21b39e9d700370e3e82835007cb6 (patch) | |
tree | 6922c9b0eec02bb4acff1ba57dc4b9dea7b71b9d /runtime/doc | |
parent | b8f3ef10c943730df8d82f229bc8b1da3a3c8294 (diff) | |
download | rneovim-abb13dde980b21b39e9d700370e3e82835007cb6.tar.gz rneovim-abb13dde980b21b39e9d700370e3e82835007cb6.tar.bz2 rneovim-abb13dde980b21b39e9d700370e3e82835007cb6.zip |
vim-patch:130cbfc31235
Update runtime files
https://github.com/vim/vim/commit/130cbfc31235c6cb52ffe718ea0a5bb50fbbc9fd
Diffstat (limited to 'runtime/doc')
-rw-r--r-- | runtime/doc/cmdline.txt | 2 | ||||
-rw-r--r-- | runtime/doc/editing.txt | 16 | ||||
-rw-r--r-- | runtime/doc/eval.txt | 4 | ||||
-rw-r--r-- | runtime/doc/ft_ps1.txt | 64 | ||||
-rw-r--r-- | runtime/doc/mbyte.txt | 2 | ||||
-rw-r--r-- | runtime/doc/options.txt | 24 | ||||
-rw-r--r-- | runtime/doc/usr_02.txt | 2 |
7 files changed, 94 insertions, 20 deletions
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index 48339a71ac..ae43aeeb25 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -563,9 +563,11 @@ followed by another Vim command: :function :global :help + :helpgrep :lcscope :ldo :lfdo + :lhelpgrep :make :normal :perlfile diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index ea1375ef3d..4700af41b7 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1210,13 +1210,13 @@ For versions of Vim where browsing is not supported, the command is executed unmodified. *browsefilter* -For Windows you can modify the filters that are used in the browse dialog. By -setting the g:browsefilter or b:browsefilter variables, you can change the -filters globally or locally to the buffer. The variable is set to a string in -the format "{filter label}\t{pattern};{pattern}\n" where {filter label} is the -text that appears in the "Files of Type" comboBox, and {pattern} is the -pattern which filters the filenames. Several patterns can be given, separated -by ';'. +For MS-Windows you can modify the filters that are used in the browse +dialog. By setting the g:browsefilter or b:browsefilter variables, you can +change the filters globally or locally to the buffer. The variable is set to +a string in the format "{filter label}\t{pattern};{pattern}\n" where {filter +label} is the text that appears in the "Files of Type" comboBox, and {pattern} +is the pattern which filters the filenames. Several patterns can be given, +separated by ';'. For example, to have only Vim files in the dialog, you could use the following command: > @@ -1294,7 +1294,7 @@ exist, the next-higher scope in the hierarchy applies. *:lch* *:lchdir* :lch[dir][!] Same as |:lcd|. - *:lcd-* + *:lcd-* :lc[d][!] - Change to the previous current directory (before the previous ":lcd {path}" command). diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index c04dddc1a9..d6419eeb39 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1249,7 +1249,7 @@ the following ways: The arguments are optional. Example: > :let F = {-> 'error function'} - :echo F() + :echo F('ignored') < error function *closure* Lambda expressions can access outer scope variables and arguments. This is @@ -4925,7 +4925,7 @@ getwininfo([{winid}]) *getwininfo()* tab pages is returned. Each List item is a |Dictionary| with the following entries: - botline last displayed buffer line + botline last complete displayed buffer line bufnr number of buffer in the window height window height (excluding winbar) loclist 1 if showing a location list diff --git a/runtime/doc/ft_ps1.txt b/runtime/doc/ft_ps1.txt new file mode 100644 index 0000000000..df1480b929 --- /dev/null +++ b/runtime/doc/ft_ps1.txt @@ -0,0 +1,64 @@ +*ps1.txt* A Windows PowerShell syntax plugin for Vim + +Author: Peter Provost <https://www.github.com/PProvost> +License: Apache 2.0 +URL: https://github.com/PProvost/vim-ps1 + +INTRODUCTION *ps1-syntax* + +This plugin provides Vim syntax, indent and filetype detection for Windows +PowerShell scripts, modules, and XML configuration files. + + +ABOUT *ps1-about* + +Grab the latest version or report a bug on GitHub: + +https://github.com/PProvost/vim-ps1 + + +FOLDING *ps1-folding* + +The ps1 syntax file provides syntax folding (see |:syn-fold|) for script blocks +and digital signatures in scripts. + +When 'foldmethod' is set to "syntax" then function script blocks will be +folded unless you use the following in your .vimrc or before opening a script: > + + :let g:ps1_nofold_blocks = 1 +< +Digital signatures in scripts will also be folded unless you use: > + + :let g:ps1_nofold_sig = 1 +< +Note: syntax folding might slow down syntax highlighting significantly, +especially for large files. + + +COMPILER *ps1-compiler* + +The powershell `:compiler` script configures |:make| to execute the script in +PowerShell. + +It tries to pick a smart default PowerShell command: `pwsh` if available and +`powershell` otherwise, but you can customize the command: > + + :let g:ps1_makeprg_cmd = '/path/to/pwsh' +< +To configure whether to show the exception type information: > + + :let g:ps1_efm_show_error_categories = 1 +< + +KEYWORD LOOKUP *ps1-keyword* + +To look up keywords using PowerShell's Get-Help, press the |K| key. For more +convenient paging, the pager `less` should be installed, which is included in +many Linux distributions and in macOS. + +Many other distributions are available for Windows like +https://chocolatey.org/packages/less/. Make sure `less` is in a directory +listed in the `PATH` environment variable, which chocolatey above does. + +------------------------------------------------------------------------------ + vim:ft=help: diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index 092f54608d..a6c797a860 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -400,7 +400,7 @@ is suitable for complex input, such as CJK. of the two ways: FrontEnd system and BackEnd system. In the FrontEnd system, input events are snatched by the |IM-server| first, then |IM-server| give the application the result of input. On the other hand, the BackEnd - system works reverse order. MS Windows adopt BackEnd system. In X, most of + system works reverse order. MS-Windows adopt BackEnd system. In X, most of |IM-server|s adopt FrontEnd system. The demerit of BackEnd system is the large overhead in communication, but it provides safe synchronization with no restrictions on applications. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 73800c5bc5..e04b79792d 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -3840,7 +3840,7 @@ A jump table for the options with a short description can be found at |Q_op|. jump between two double quotes. The characters must be separated by a colon. The pairs must be separated by a comma. Example for including '<' and - '>' (HTML): > + '>' (for HTML): > :set mps+=<:> < A more exotic example, to jump between the '=' and ';' in an @@ -6832,23 +6832,31 @@ A jump table for the options with a short description can be found at |Q_op|. part specifies what to do for each consecutive use of 'wildchar'. The first part specifies the behavior for the first use of 'wildchar', The second part for the second use, etc. - These are the possible values for each part: + + Each part consists of a colon separated list consisting of the + following possible values: "" Complete only the first match. "full" Complete the next full match. After the last match, the original string is used and then the first match - again. + again. Will also start 'wildmenu' if it is enabled. "longest" Complete till longest common string. If this doesn't result in a longer string, use the next part. - "longest:full" Like "longest", but also start 'wildmenu' if it is - enabled. "list" When more than one match, list all matches. + "lastused" When completing buffer names and more than one buffer + matches, sort buffers by time last used (other than + the current buffer). + When there is only a single match, it is fully completed in all cases. + + Examples of useful colon-separated values: + "longest:full" Like "longest", but also start 'wildmenu' if it is + enabled. Will not complete to the next full match. "list:full" When more than one match, list all matches and complete first match. "list:longest" When more than one match, list all matches and complete till longest common string. - "list:lastused" When more than one buffer matches, sort buffers - by time last used (other than the current buffer). - When there is only a single match, it is fully completed in all cases. + "list:lastused" When more than one buffer matches, list all matches + and sort buffers by time last used (other than the + current buffer). Examples: > :set wildmode=full diff --git a/runtime/doc/usr_02.txt b/runtime/doc/usr_02.txt index ad31649d01..9373484da0 100644 --- a/runtime/doc/usr_02.txt +++ b/runtime/doc/usr_02.txt @@ -42,7 +42,7 @@ blank window. This is what your screen will look like: |~ | |"file.txt" [New file] | +---------------------------------------+ - ('#" is the cursor position.) + ('#' is the cursor position.) The tilde (~) lines indicate lines not in the file. In other words, when Vim runs out of file to display, it displays tilde lines. At the bottom of the |