aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-05-01 14:23:09 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-05-01 22:29:02 -0400
commit330500a5bfb1207e0c9eb79ac27fb8244da93ce0 (patch)
treebf830508b9063636dbbb064175ade5f2b7996bf9 /runtime/doc
parentb16c7c515c34d2f695a595527594325abc6a640b (diff)
downloadrneovim-330500a5bfb1207e0c9eb79ac27fb8244da93ce0.tar.gz
rneovim-330500a5bfb1207e0c9eb79ac27fb8244da93ce0.tar.bz2
rneovim-330500a5bfb1207e0c9eb79ac27fb8244da93ce0.zip
vim-patch:cb80aa2d53e5
Update runtime files. https://github.com/vim/vim/commit/cb80aa2d53e56d3aba3b3c439fb467f29a750c5e Omit runtime/doc/tabpage.txt. Patch v8.2.1401 is not ported yet. Port optwin.vim changes without gettext(). Patch v8.2.1544 is not ported yet.
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/autocmd.txt2
-rw-r--r--runtime/doc/editing.txt8
-rw-r--r--runtime/doc/eval.txt8
-rw-r--r--runtime/doc/insert.txt1
-rw-r--r--runtime/doc/motion.txt7
-rw-r--r--runtime/doc/pi_zip.txt2
-rw-r--r--runtime/doc/undo.txt2
-rw-r--r--runtime/doc/usr_11.txt2
8 files changed, 21 insertions, 11 deletions
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 6619449d91..ab2c411ee2 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -709,7 +709,7 @@ InsertEnter Just before starting Insert mode. Also for
string.
*InsertLeavePre*
InsertLeavePre Just before leaving Insert mode. Also when
- using CTRL-O |i_CTRL-O|. Be caseful not to
+ using CTRL-O |i_CTRL-O|. Be careful not to
change mode or use `:normal`, it will likely
cause trouble.
*InsertLeave*
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 10e1501927..15a9fcdde4 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -63,10 +63,14 @@ g CTRL-G Prints the current position of the cursor in five
ways: Column, Line, Word, Character and Byte. If the
number of Characters and Bytes is the same then the
Character position is omitted.
+
If there are characters in the line that take more
than one position on the screen (<Tab> or special
- character), both the "real" column and the screen
- column are shown, separated with a dash.
+ character), or characters using more than one byte per
+ column (characters above 0x7F when 'encoding' is
+ utf-8), both the byte column and the screen column are
+ shown, separated by a dash.
+
Also see the 'ruler' option and the |wordcount()|
function.
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index fafe701d18..2c9140ef0a 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -9306,7 +9306,8 @@ winsaveview() Returns a |Dictionary| that contains information to restore
curswant column for vertical movement
topline first line in the window
topfill filler lines, only in diff mode
- leftcol first column displayed
+ leftcol first column displayed; only used when
+ 'wrap' is off
skipcol columns skipped
Note that no option values are saved.
@@ -9796,8 +9797,9 @@ be used to pass settings to the autoload script before it's loaded: >
Note that when you make a mistake and call a function that is supposed to be
defined in an autoload script, but the script doesn't actually define the
-function, the script will be sourced every time you try to call the function.
-And you will get an error message every time.
+function, you will get an error message for the missing function. If you fix
+the autoload script it won't be automatically loaded again. Either restart
+Vim or manually source the script.
Also note that if you have two script files, and one calls a function in the
other and vice versa, before the used function is defined, it won't work.
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 63bdfd2581..c8a4168ab2 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -292,6 +292,7 @@ If you enter a value of 10, it will end up in the file as a 0. The 10 is a
the buffer to a file, the <NL> character is translated into <Nul>. The <NL>
character is written at the end of each line. Thus if you want to insert a
<NL> character in a file you will have to make a line break.
+Also see 'fileformat'.
*i_CTRL-X* *insert_expand*
CTRL-X enters a sub-mode where several commands can be used. Most of these
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index 763ff02db1..6b99128272 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -182,11 +182,14 @@ l or *l*
*^*
^ To the first non-blank character of the line.
- |exclusive| motion.
+ |exclusive| motion. Any count is ignored.
*$* *<End>* *<kEnd>*
$ or <End> To the end of the line. When a count is given also go
- [count - 1] lines downward. |inclusive| motion.
+ [count - 1] lines downward, or as far is possible.
+ |inclusive| motion. If a count of 2 of larger is
+ given and the cursor is on the last line, that is an
+ error an the cursor doesn't move.
In Visual mode the cursor goes to just after the last
character in the line.
When 'virtualedit' is active, "$" may move the cursor
diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt
index 18d055315d..c715644847 100644
--- a/runtime/doc/pi_zip.txt
+++ b/runtime/doc/pi_zip.txt
@@ -154,4 +154,4 @@ Copyright: Copyright (C) 2005-2015 Charles E Campbell *zip-copyright*
v1 Sep 15, 2005 * Initial release, had browsing, reading, and writing
==============================================================================
-vim:tw=78:ts=8:noet:ft=help:fdm=marker
+vim:tw=78:ts=8:ft=help:noet:norl:fdm=marker
diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt
index 0fc164965a..160b6cecfd 100644
--- a/runtime/doc/undo.txt
+++ b/runtime/doc/undo.txt
@@ -371,7 +371,7 @@ back the text of three deletes ago with '"3P'.
*redo-register*
If you want to get back more than one part of deleted text, you can use a
special feature of the repeat command ".". It will increase the number of the
-register used. So if you first do ""1P", the following "." will result in a
+register used. So if you first do '"1P', the following "." will result in a
'"2P'. Repeating this will result in all numbered registers being inserted.
Example: If you deleted text with 'dd....' it can be restored with
diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt
index d7d22c4227..361fe51caa 100644
--- a/runtime/doc/usr_11.txt
+++ b/runtime/doc/usr_11.txt
@@ -293,7 +293,7 @@ machines. Therefore, don't rely on Vim always warning you.
If you really don't want to see this message, you can add the 'A' flag to the
'shortmess' option. But it's very unusual that you need this.
-For programatic access to the swap file, see |swapinfo()|.
+For programmatic access to the swap file, see |swapinfo()|.
==============================================================================
*11.4* Further reading