aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-04-23 20:52:29 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-04-27 09:21:28 -0400
commit233292b0ba9fb5d60ef7b2973c3a778e9c12be0c (patch)
tree108a9452a847baefbb2e90e913fb9b46b0fd3459 /runtime/doc
parentf0bf853f41ac4ad765bf279c331669d8c9d1e5c5 (diff)
downloadrneovim-233292b0ba9fb5d60ef7b2973c3a778e9c12be0c.tar.gz
rneovim-233292b0ba9fb5d60ef7b2973c3a778e9c12be0c.tar.bz2
rneovim-233292b0ba9fb5d60ef7b2973c3a778e9c12be0c.zip
vim-patch:96f45c0b6fc9
Update runtime files https://github.com/vim/vim/commit/96f45c0b6fc9e9d404e6805593ed1e0e6795e470 Omit de.po changes. Same reason as before: too much and I don't understand the language.
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/eval.txt22
-rw-r--r--runtime/doc/helphelp.txt6
-rw-r--r--runtime/doc/options.txt23
-rw-r--r--runtime/doc/quickfix.txt2
-rw-r--r--runtime/doc/syntax.txt20
-rw-r--r--runtime/doc/windows.txt3
6 files changed, 52 insertions, 24 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 685a6a52e8..383acbe64f 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -3701,8 +3701,8 @@ expandcmd({expr}) *expandcmd()*
Expand special items in {expr} like what is done for an Ex
command such as `:edit`. This expands special keywords, like
with |expand()|, and environment variables, anywhere in
- {expr}. Returns the expanded string.
- Example: >
+ {expr}. "~user" and "~/path" are only expanded at the start.
+ Returns the expanded string. Example: >
:echo expandcmd('make %<.o')
<
extend({expr1}, {expr2} [, {expr3}]) *extend()*
@@ -6691,15 +6691,15 @@ prompt_setprompt({buf}, {text}) *prompt_setprompt()*
call prompt_setprompt(bufnr(''), 'command: ')
pum_getpos() *pum_getpos()*
- If the popup menu (see |ins-completion-menu|) is not visible,
- returns an empty |Dictionary|, otherwise, returns a
- |Dictionary| with the following keys:
- height nr of items visible
- width screen cells
- row top screen row (0 first row)
- col leftmost screen column (0 first col)
- size total nr of items
- scrollbar |TRUE| if visible
+ If the popup menu (see |ins-completion-menu|) is not visible,
+ returns an empty |Dictionary|, otherwise, returns a
+ |Dictionary| with the following keys:
+ height nr of items visible
+ width screen cells
+ row top screen row (0 first row)
+ col leftmost screen column (0 first col)
+ size total nr of items
+ scrollbar |TRUE| if scrollbar is visible
The values are the same as in |v:event| during |CompleteChanged|.
diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt
index ba6dd02a29..182fc1cef5 100644
--- a/runtime/doc/helphelp.txt
+++ b/runtime/doc/helphelp.txt
@@ -103,7 +103,11 @@ Help on help files *helphelp*
current file. See |help-translated|.
*:helpc* *:helpclose*
-:helpc[lose] Close one help window, if there is one.
+:helpc[lose] Close one help window, if there is one.
+ Vim will try to restore the window layout (including
+ cursor position) to the same layout it was before
+ opening the help window initially. This might cause
+ triggering several autocommands.
*:helpg* *:helpgrep*
:helpg[rep] {pattern}[@xx]
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 9d94b568a4..9695aee15a 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5243,10 +5243,10 @@ A jump table for the options with a short description can be found at |Q_op|.
For Unix the default it "| tee". The stdout of the compiler is saved
in a file and echoed to the screen. If the 'shell' option is "csh" or
"tcsh" after initializations, the default becomes "|& tee". If the
- 'shell' option is "sh", "ksh", "mksh", "pdksh", "zsh" or "bash" the
- default becomes "2>&1| tee". This means that stderr is also included.
- Before using the 'shell' option a path is removed, thus "/bin/sh" uses
- "sh".
+ 'shell' option is "sh", "ksh", "mksh", "pdksh", "zsh", "zsh-beta",
+ "bash" or "fish" the default becomes "2>&1| tee". This means that
+ stderr is also included. Before using the 'shell' option a path is
+ removed, thus "/bin/sh" uses "sh".
The initialization of this option is done after reading the vimrc
and the other initializations, so that when the 'shell' option is set
there, the 'shellpipe' option changes automatically, unless it was
@@ -5286,13 +5286,14 @@ A jump table for the options with a short description can be found at |Q_op|.
The name of the temporary file can be represented by "%s" if necessary
(the file name is appended automatically if no %s appears in the value
of this option).
- The default is ">". For Unix, if the 'shell' option is "csh", "tcsh"
- or "zsh" during initializations, the default becomes ">&". If the
- 'shell' option is "sh", "ksh" or "bash" the default becomes
- ">%s 2>&1". This means that stderr is also included.
- For Win32, the Unix checks are done and additionally "cmd" is checked
- for, which makes the default ">%s 2>&1". Also, the same names with
- ".exe" appended are checked for.
+ The default is ">". For Unix, if the 'shell' option is "csh" or
+ "tcsh" during initializations, the default becomes ">&". If the
+ 'shell' option is "sh", "ksh", "mksh", "pdksh", "zsh",
+ "zsh-beta","bash" or "fish", the default becomes ">%s 2>&1". This
+ means that stderr is also included. For Win32, the Unix checks are
+ done and additionally "cmd" is checked for, which makes the default
+ ">%s 2>&1". Also, the same names with ".exe" appended are checked
+ for.
The initialization of this option is done after reading the vimrc
and the other initializations, so that when the 'shell' option is set
there, the 'shellredir' option changes automatically unless it was
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index fab3b11430..a60e3d4b60 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -484,7 +484,7 @@ EXECUTE A COMMAND IN ALL THE BUFFERS IN QUICKFIX OR LOCATION LIST:
etc.
< When the current file can't be |abandon|ed and the [!]
is not present, the command fails.
- When an error is detected execution stops.
+ When going to the next entry fails execution stops.
The last buffer (or where an error occurred) becomes
the current buffer.
{cmd} can contain '|' to concatenate several commands.
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index e527ef2158..0fe4893924 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1135,6 +1135,26 @@ startup vimrc: >
:let filetype_w = "cweb"
+DART *dart.vim* *ft-dart-syntax*
+
+Dart is an object-oriented, typed, class defined, garbage collected language
+used for developing mobile, desktop, web, and back-end applications. Dart uses
+a C-like syntax derived from C, Java, and JavaScript, with features adopted
+from Smalltalk, Python, Ruby, and others.
+
+More information about the language and its development environment at the
+official Dart language website at https://dart.dev
+
+dart.vim syntax detects and highlights Dart statements, reserved words,
+type declarations, storage classes, conditionals, loops, interpolated values,
+and comments. There is no support idioms from Flutter or any other Dart
+framework.
+
+Changes, fixes? Submit an issue or pull request via:
+
+https://github.com/pr3d4t0r/dart-vim-syntax/
+
+
DESKTOP *desktop.vim* *ft-desktop-syntax*
Primary goal of this syntax file is to highlight .desktop and .directory files
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index 35efb1bbce..2de2351e11 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -287,6 +287,9 @@ CTRL-W CTRL-Q *CTRL-W_CTRL-Q*
:+quit " quit the next window
:+2quit " quit the second next window
<
+ When closing a help window, Vim will try to restore the
+ previous window layout |:helpclose|.
+
:q[uit]!
:{count}q[uit]!
Without {count}: Quit the current window. If {count} is