aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorckelsel <ckelsel@hotmail.com>2017-08-07 07:51:03 +0800
committerckelsel <ckelsel@hotmail.com>2017-08-07 07:51:03 +0800
commit8b4dc955b7384180c1ae0eab6050bbf4e17c7673 (patch)
tree32508d91df7b98baeae52288b8cf0aa08b40b80a /runtime
parentc972efc9d113232b2688ea5c2adc8834a4eda195 (diff)
parent2753d61e4cb037323d78ed3fd978a10694c902c6 (diff)
downloadrneovim-8b4dc955b7384180c1ae0eab6050bbf4e17c7673.tar.gz
rneovim-8b4dc955b7384180c1ae0eab6050bbf4e17c7673.tar.bz2
rneovim-8b4dc955b7384180c1ae0eab6050bbf4e17c7673.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/cmdline.txt7
-rw-r--r--runtime/doc/starting.txt7
2 files changed, 9 insertions, 5 deletions
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index d870a72600..652487d8ab 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -327,8 +327,11 @@ terminals)
List entries 6 to 12 from the search history: >
:history / 6,12
<
- List the recent five entries from all histories: >
- :history all -5,
+ List the penultimate entry from all histories: >
+ :history all -2
+<
+ List the most recent two entries from all histories: >
+ :history all -2,
:keepp[atterns] {command} *:keepp* *:keeppatterns*
Execute {command}, without adding anything to the search
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 91915406cb..4cfc98d5b6 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -53,7 +53,7 @@ filename One or more file names. The first one will be the current
< Starting in Ex mode: >
nvim -e -
nvim -E
-< Start editing in silent mode. See |-s-ex|.
+< Start editing in |silent-mode|.
*-t* *-tag*
-t {tag} A tag. "tag" is looked up in the tags file, the associated
@@ -200,7 +200,7 @@ argument.
*-E*
-E Start Vim in improved Ex mode |gQ|.
- *-s-ex*
+ *-s-ex* *silent-mode*
-s Silent or batch mode. Only when "-s" is preceded by the "-e"
argument. Otherwise see |-s|, which does take an argument
while this use of "-s" doesn't. To be used when Vim is used
@@ -221,7 +221,7 @@ argument.
Initializations are skipped (except the ones given with the
"-u" argument).
Example: >
- vim -e -s < thefilter thefile
+ vim -es < thefilter thefile
<
*-b*
-b Binary mode. File I/O will only recognize <NL> to separate
@@ -351,6 +351,7 @@ argument.
*--headless*
--headless Do not start the built-in UI.
+ See also |silent-mode|, which does start a (limited) UI.
==============================================================================
2. Initialization *initialization* *startup*