summaryrefslogtreecommitdiff
path: root/runtime/doc/options.txt
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-10-26 19:53:45 +0200
committerBram Moolenaar <Bram@vim.org>2019-10-26 19:53:45 +0200
commit96f45c0b6fc9e9d404e6805593ed1e0e6795e470 (patch)
tree464f7bdede1dfdc25db516ae130ce8f7d6d76efb /runtime/doc/options.txt
parent8fc42964363087025a27e8c80276c706536fc4e3 (diff)
downloadvim-git-96f45c0b6fc9e9d404e6805593ed1e0e6795e470.tar.gz
Update runtime files
Diffstat (limited to 'runtime/doc/options.txt')
-rw-r--r--runtime/doc/options.txt25
1 files changed, 13 insertions, 12 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index e62ee8974..029a0727f 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 8.1. Last change: 2019 Oct 20
+*options.txt* For Vim version 8.1. Last change: 2019 Oct 26
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -6497,10 +6497,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
@@ -6540,13 +6540,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