Hi Bram and list,
I've attached a fix patch for the document.
Detail:
eval.txt
- L3510: The empty string check method is not correct.
- L11034: typo. s/are are/are/
gui.txt
- L1049: Remove unnecessary whitespace at the end of line.
- L1115: BALTIC is duplicated.
- After L1139: It has not been formatted.
motion.txt
- `gw` is missing.
options.txt
- L3622: Remove extra characters `- ` at the beginning of line.
- L5062: Move `E21` to a position that I think is appropriate.
pattern.txt
- L64, L68: Deletion omission of description about Vi.
usr_22.txt
- s/":cd"/`:cd`/
(I adjusted to the previous line correction)
usr_41.txt
- Add listener_flush().
various.txt
- Remove unbalanced right parenthesis.
(You may add a left parenthesis :-)
vi_diff.txt
- L202: typo. s/specificed/specified/
- L869, L1058: typo. s/Vim/Vi/
- L904: Added the reference of `WORD` and `Nmove`.
Check it out.
--
Best regards,
Hirohito Higashi (h_east)
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/c78deb48-800d-488c-809f-bffb6435327e%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index e82cf3235..5a00da521 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -3507,7 +3507,7 @@ chdir({dir}) *chdir()*
Example: >
let save_dir = chdir(newdir)
- if save_dir
+ if save_dir != ""
" ... do some work
call chdir(save_dir)
endif
@@ -11031,7 +11031,7 @@ Example: >
The argument default expressions are evaluated at the time of the function
call, not definition. Thus it is possible to use an expression which is
-invalid the moment the function is defined. The expressions are are also only
+invalid the moment the function is defined. The expressions are also only
evaluated when arguments are not specified during a call.
You can pass |v:none| to use the default expression. Note that this means you
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index c24d67273..c50e075a4 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -1046,7 +1046,7 @@ GUIFONT *gui-font*
'guifont' is the option that tells Vim what font to use. In its simplest form
the value is just one font name. It can also be a list of font names
separated with commas. The first valid font is used. When no valid font can
-be found you will get an error message.
+be found you will get an error message.
On systems where 'guifontset' is supported (X11) and 'guifontset' is not
empty, then 'guifont' is not used. See |xfontset|.
@@ -1112,10 +1112,9 @@ For the Win32 GUI *E244* *E245*
cXX - character set XX. Valid charsets are: ANSI, ARABIC, BALTIC,
CHINESEBIG5, DEFAULT, EASTEUROPE, GB2312, GREEK, HANGEUL,
HEBREW, JOHAB, MAC, OEM, RUSSIAN, SHIFTJIS, SYMBOL, THAI,
- TURKISH, VIETNAMESE ANSI and BALTIC. Normally you would use
- "cDEFAULT".
+ TURKISH and VIETNAMESE ANSI. Normally you would use "cDEFAULT".
qXX - quality XX. Valid quality names are: PROOF, DRAFT, ANTIALIASED,
- NONANTIALIASED, CLEARTYPE, DEFAULT. Normally you would use
+ NONANTIALIASED, CLEARTYPE and DEFAULT. Normally you would use
"qDEFAULT".
Some quality values are not supported in legacy OSs.
- A '_' can be used in the place of a space, so you don't need to use
@@ -1139,30 +1138,28 @@ substitution.
GUIFONTWIDE *gui-fontwide*
When not empty, 'guifontwide' specifies a comma-separated list of fonts to be
-used for double-width characters. The first font that can be loaded is
-used.
+used for double-width characters. The first font that can be loaded is used.
Note: The size of these fonts must be exactly twice as wide as the one
-specified with 'guifont' and the same height. If there is a mismatch then
-the text will not be drawn correctly.
+specified with 'guifont' and the same height. If there is a mismatch then the
+text will not be drawn correctly.
All GUI versions but GTK+:
-'guifontwide' is only used when 'encoding' is set to "utf-8" and
-'guifontset' is empty or invalid.
-When 'guifont' is set and a valid font is found in it and
-'guifontwide' is empty Vim will attempt to find a matching
-double-width font and set 'guifontwide' to it.
+'guifontwide' is only used when 'encoding' is set to "utf-8" and 'guifontset'
+is empty or invalid.
+When 'guifont' is set and a valid font is found in it and 'guifontwide' is
+empty Vim will attempt to find a matching double-width font and set
+'guifontwide' to it.
GTK+ GUI only: *guifontwide_gtk*
-If set and valid, 'guifontwide' is always used for double width
-characters, even if 'encoding' is not set to "utf-8".
+If set and valid, 'guifontwide' is always used for double width characters,
+even if 'encoding' is not set to "utf-8".
Vim does not attempt to find an appropriate value for 'guifontwide'
-automatically. If 'guifontwide' is empty Pango/Xft will choose the
-font for characters not available in 'guifont'. Thus you do not need
-to set 'guifontwide' at all unless you want to override the choice
-made by Pango/Xft.
+automatically. If 'guifontwide' is empty Pango/Xft will choose the font for
+characters not available in 'guifont'. Thus you do not need to set
+'guifontwide' at all unless you want to override the choice made by Pango/Xft.
Windows +multibyte only: *guifontwide_win_mbyte*
@@ -1181,7 +1178,8 @@ This section describes other features which are related to the GUI.
get "<Modifiers-Key>".
- In the GUI, the modifiers SHIFT, CTRL, and ALT (or META) may be used within
- mappings of special keys and mouse events. E.g.: :map <M-LeftDrag> <LeftDrag>
+ mappings of special keys and mouse events.
+ E.g.: :map <M-LeftDrag> <LeftDrag>
- In the GUI, several normal keys may have modifiers in mappings etc, these
are <Space>, <Tab>, <NL>, <CR>, <Esc>.
@@ -1218,8 +1216,8 @@ http://www.lexikan.com/mincho.htm
For the X11 GUI the external commands are executed inside the gvim window.
See |gui-pty|.
-WARNING: Executing an external command from the X11 GUI will not always
-work. "normal" commands like "ls", "grep" and "make" mostly work fine.
+WARNING: Executing an external command from the X11 GUI will not always work.
+"normal" commands like "ls", "grep" and "make" mostly work fine.
Commands that require an intelligent terminal like "less" and "ispell" won't
work. Some may even hang and need to be killed from another terminal. So be
careful!
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index 64b1fbfc2..97a0fae56 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -53,6 +53,7 @@ or change text. The following operators are available:
|!| ! filter through an external program
|=| = filter through 'equalprg' or C-indenting if empty
|gq| gq text formatting
+ |gw| gw text formatting with no cursor movement
|g?| g? ROT13 encoding
|>| > shift right
|<| < shift left
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 691a8b68b..506a0bf09 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3619,7 +3619,7 @@ A jump table for the options with a short description can be found at |Q_op|.
*'guiheadroom'* *'ghr'*
'guiheadroom' 'ghr' number (default 50)
global
-- {only for GTK and X11 GUI}
+ {only for GTK and X11 GUI}
The number of pixels subtracted from the screen height when fitting
the GUI window on the screen. Set this before the GUI is started,
e.g., in your |gvimrc| file. When zero, the whole screen height will
@@ -5059,9 +5059,9 @@ A jump table for the options with a short description can be found at |Q_op|.
set and to the Vim default value when 'compatible' is reset.
*'modifiable'* *'ma'* *'nomodifiable'* *'noma'*
+ *E21*
'modifiable' 'ma' boolean (default on)
local to buffer
- *E21*
When off the buffer contents cannot be changed. The 'fileformat' and
'fileencoding' options also can't be changed.
Can be reset on startup with the |-M| command line argument.
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index 8babf0b23..f9d5d51fe 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -61,11 +61,11 @@ explanations are in chapter 27 |usr_27.txt|.
n Repeat the latest "/" or "?" [count] times.
If the cursor doesn't move the search is repeated with
count + 1.
- |last-pattern| {Vi: no count}
+ |last-pattern|
*N*
N Repeat the latest "/" or "?" [count] times in
- opposite direction. |last-pattern| {Vi: no count}
+ opposite direction. |last-pattern|
*star* *E348* *E349*
* Search forward for the [count]'th occurrence of the
diff --git a/runtime/doc/usr_22.txt b/runtime/doc/usr_22.txt
index b3da19cc6..3fcdf31e6 100644
--- a/runtime/doc/usr_22.txt
+++ b/runtime/doc/usr_22.txt
@@ -220,7 +220,7 @@ a tab page share this directory except for windows with a window-local
directory. Any new windows opened in this tab page will use this directory as
the current working directory. Using a `:cd` command in a tab page will not
change the working directory of tab pages which have a tab local directory.
-When the global working directory is changed using the ":cd" command in a tab
+When the global working directory is changed using the `:cd` command in a tab
page, it will also change the current tab page working directory.
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 866664c4d..f78166df7 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -813,6 +813,7 @@ Buffers, windows and the argument list:
appendbufline() append a list of lines in the specified buffer
deletebufline() delete lines from a specified buffer
listener_add() add a callback to listen to changes
+ listener_flush() Invoke listener callback
listener_remove() remove a listener callback
win_findbuf() find windows containing a buffer
win_getid() get window ID of a window
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 5e9f5cccc..784a08e46 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -708,7 +708,7 @@ K Run a program to lookup the keyword under the
:xr[estore] [display] Reinitializes the connection to the X11 server. Useful
after the X server restarts, e.g. when running Vim for
long time inside screen/tmux and connecting from
- different machines).
+ different machines.
[display] should be in the format of the $DISPLAY
environment variable (e.g. "localhost:10.0")
If [display] is omitted, then it reinitializes the
diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt
index 715021e6b..942a60942 100644
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -199,7 +199,7 @@ Syntax highlighting. |:syntax|
Text properties |textprop.txt|
Vim supports highlighting text by a plugin. Property types can be
- specificed with |prop_type_add()| and properties can be placed with
+ specified with |prop_type_add()| and properties can be placed with
|prop_add()|.
Spell checking. |spell|
@@ -866,7 +866,7 @@ The following Ex commands are supported by Vi: ~
`:set all&`, `:set option+=value`, `:set option^=value`
`:set option-=value` `:set option<`
`:shell` escape to a shell
-`:source` read Vim or Ex commands from a file
+`:source` read Vi or Ex commands from a file
`:stop` suspend the editor or escape to a shell
`:substitute` find and replace text; Vi: no '&', 'i', 's', 'r' or 'I' flag,
confirm prompt only supports 'y' and 'n', no highlighting
@@ -901,6 +901,9 @@ Common for these commands is that Vi doesn't support the ++opt argument on
The following Normal mode commands are supported by Vi: ~
+note: See the beginning of |normal-index| for the meaning of WORD, N, Nmove
+and etc in the description text.
+
|CTRL-B| scroll N screens Backwards
|CTRL-C| interrupt current (search) command
|CTRL-D| scroll Down N lines (default: half a screen); Vim scrolls
@@ -1055,7 +1058,7 @@ CTRL-T insert one shiftwidth of indent in current line {Vi: only when
in indent}
CTRL-V {char} insert next non-digit literally {Vi: no decimal byte entry}
CTRL-W delete word before the cursor
-CTRL-Z when 'insertmode' set: suspend Vim
+CTRL-Z when 'insertmode' set: suspend Vi
<Esc> end insert mode (unless 'insertmode' set)
CTRL-[ same as <Esc>
0 CTRL-D delete all indent in the current line
