0
0
mirror of https://github.com/vim/vim.git synced 2025-08-27 20:13:38 -04:00

Fixed ":s" message. Docs updates.

This commit is contained in:
Bram Moolenaar 2010-07-10 13:52:13 +02:00
parent d04b7507fd
commit 0bc380a96b
8 changed files with 37 additions and 22 deletions

View File

@ -5571,6 +5571,10 @@ synstack({lnum}, {col}) *synstack()*
for id in synstack(line("."), col(".")) for id in synstack(line("."), col("."))
echo synIDattr(id, "name") echo synIDattr(id, "name")
endfor endfor
< When the position specified with {lnum} and {col} is invalid
nothing is returned. The position just after the last
character in a line and the first column in an empty line are
valid positions.
system({expr} [, {input}]) *system()* *E677* system({expr} [, {input}]) *system()* *E677*
Get the output of the shell command {expr}. Get the output of the shell command {expr}.

View File

@ -1267,8 +1267,8 @@ is no longer relevant in the GTK+ 2 GUI.
When reading a file a BOM (Byte Order Mark) can be used to recognize the When reading a file a BOM (Byte Order Mark) can be used to recognize the
Unicode encoding: Unicode encoding:
EF BB BF utf-8 EF BB BF utf-8
FF FE utf-16 big endian FE FF utf-16 big endian
FE FF utf-16 little endian FF FE utf-16 little endian
00 00 FE FF utf-32 big endian 00 00 FE FF utf-32 big endian
FF FE 00 00 utf-32 little endian FF FE 00 00 utf-32 little endian

View File

@ -4917,7 +4917,7 @@ A jump table for the options with a short description can be found at |Q_op|.
respectively; see |CTRL-A| for more info on these commands. respectively; see |CTRL-A| for more info on these commands.
alpha If included, single alphabetical characters will be alpha If included, single alphabetical characters will be
incremented or decremented. This is useful for a list with a incremented or decremented. This is useful for a list with a
letter index a), b), etc. letter index a), b), etc. *octal*
octal If included, numbers that start with a zero will be considered octal If included, numbers that start with a zero will be considered
to be octal. Example: Using CTRL-A on "007" results in "010". to be octal. Example: Using CTRL-A on "007" results in "010".
hex If included, numbers starting with "0x" or "0X" will be hex If included, numbers starting with "0x" or "0X" will be

View File

@ -995,7 +995,8 @@ x A single character, with no special meaning, matches itself
in the collection: "[^xyz]" matches anything but 'x', 'y' and 'z'. in the collection: "[^xyz]" matches anything but 'x', 'y' and 'z'.
- If two characters in the sequence are separated by '-', this is - If two characters in the sequence are separated by '-', this is
shorthand for the full list of ASCII characters between them. E.g., shorthand for the full list of ASCII characters between them. E.g.,
"[0-9]" matches any decimal digit. "[0-9]" matches any decimal digit. Non-ASCII characters can be
used, but the character values must not be more than 256 apart.
- A character class expression is evaluated to the set of characters - A character class expression is evaluated to the set of characters
belonging to that character class. The following character classes belonging to that character class. The following character classes
are supported: are supported:
@ -1043,9 +1044,9 @@ x A single character, with no special meaning, matches itself
"^"): "[]xyz]" or "[^]xyz]" {not in Vi}. "^"): "[]xyz]" or "[^]xyz]" {not in Vi}.
For '-' you can also make it the first or last character: "[-xyz]", For '-' you can also make it the first or last character: "[-xyz]",
"[^-xyz]" or "[xyz-]". For '\' you can also let it be followed by "[^-xyz]" or "[xyz-]". For '\' you can also let it be followed by
any character that's not in "^]-\bertn". "[\xyz]" matches '\', 'x', any character that's not in "^]-\bdertnoUux". "[\xyz]" matches '\',
'y' and 'z'. It's better to use "\\" though, future expansions may 'x', 'y' and 'z'. It's better to use "\\" though, future expansions
use other characters after '\'. may use other characters after '\'.
- The following translations are accepted when the 'l' flag is not - The following translations are accepted when the 'l' flag is not
included in 'cpoptions' {not in Vi}: included in 'cpoptions' {not in Vi}:
\e <Esc> \e <Esc>

View File

@ -1089,6 +1089,9 @@ Patch to support horizontal scroll wheel in GTK. Untested. (Bjorn Winckler,
Vim 7.3: Vim 7.3:
- :s messages concatenate (Tony)
- Windows XP: copying only gets first letter of bad spelled word. (Cesar
Romani, 2010 Jul 7)
- in August remove UF_VERSION_CRYPT_PREV and UF_VERSION_PREV. - in August remove UF_VERSION_CRYPT_PREV and UF_VERSION_PREV.
- Conceal feature: no update when moving to another window. (Dominique Pelle, - Conceal feature: no update when moving to another window. (Dominique Pelle,
2010 Jul 5) Vince will look into it. 2010 Jul 5) Vince will look into it.

View File

@ -7232,5 +7232,8 @@ MS-Windows: The self-installing executable now also works on 64-bit systems.
The gvim executable is 32 bits, the installed gvimext.dll is either a 32 or 64 The gvim executable is 32 bits, the installed gvimext.dll is either a 32 or 64
bit version. (George Reilly) bit version. (George Reilly)
synstack() did not return anything when just past the end of the line. Useful
when using the cursor position in Insert mode.
vim:tw=78:ts=8:ft=help:norl: vim:tw=78:ts=8:ft=help:norl:

View File

@ -5176,6 +5176,8 @@ do_sub_msg(count_only)
{ {
if (got_int) if (got_int)
STRCPY(msg_buf, _("(Interrupted) ")); STRCPY(msg_buf, _("(Interrupted) "));
else
*msg_buf = NUL;
if (sub_nsubs == 1) if (sub_nsubs == 1)
vim_snprintf_add((char *)msg_buf, sizeof(msg_buf), vim_snprintf_add((char *)msg_buf, sizeof(msg_buf),
"%s", count_only ? _("1 match") : _("1 substitution")); "%s", count_only ? _("1 match") : _("1 substitution"));

View File

@ -5410,6 +5410,7 @@ nv_ident(cap)
{ {
char_u *ptr = NULL; char_u *ptr = NULL;
char_u *buf; char_u *buf;
char_u *newbuf;
char_u *p; char_u *p;
char_u *kp; /* value of 'keywordprg' */ char_u *kp; /* value of 'keywordprg' */
int kp_help; /* 'keywordprg' is ":help" */ int kp_help; /* 'keywordprg' is ":help" */
@ -5562,13 +5563,14 @@ nv_ident(cap)
vim_free(buf); vim_free(buf);
return; return;
} }
buf = (char_u *)vim_realloc(buf, STRLEN(buf) + STRLEN(p) + 1); newbuf = (char_u *)vim_realloc(buf, STRLEN(buf) + STRLEN(p) + 1);
if (buf == NULL) if (newbuf == NULL)
{ {
vim_free(buf); vim_free(buf);
vim_free(p); vim_free(p);
return; return;
} }
buf = newbuf;
STRCAT(buf, p); STRCAT(buf, p);
vim_free(p); vim_free(p);
} }