1
0
forked from aniani/vim

updated for version 7.2-223

This commit is contained in:
Bram Moolenaar
2009-07-09 13:55:43 +00:00
parent 8d5946760b
commit 8e258a4a94
4 changed files with 30 additions and 8 deletions

View File

@@ -508,6 +508,17 @@ N *+X11* Unix only: can restore window title |X11|
messages though. Use ":silent" in the command itself messages though. Use ":silent" in the command itself
to avoid that: ":silent menu .... :silent command". to avoid that: ":silent menu .... :silent command".
*:uns* *:unsilent*
:uns[ilent] {command} Execute {command} not silently. Only makes a
difference when |:silent| was used to get to this
command.
Use this for giving a message even when |:silent| was
used. In this example |:silent| is used to avoid the
message about reading the file and |:unsilent| to be
able to list the first line of each file. >
:silent argdo unsilent echo expand('%') . ": " . getline(1)
<
*:verb* *:verbose* *:verb* *:verbose*
:[count]verb[ose] {command} :[count]verb[ose] {command}
Execute {command} with 'verbose' set to [count]. If Execute {command} with 'verbose' set to [count]. If

View File

@@ -991,6 +991,8 @@ EX(CMD_unmap, "unmap", ex_unmap,
BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN), BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
EX(CMD_unmenu, "unmenu", ex_menu, EX(CMD_unmenu, "unmenu", ex_menu,
BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN), BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
EX(CMD_unsilent, "unsilent", ex_wrongmodifier,
NEEDARG|EXTRA|NOTRLCOM|SBOXOK|CMDWIN),
EX(CMD_update, "update", ex_update, EX(CMD_update, "update", ex_update,
RANGE|WHOLEFOLD|BANG|FILE1|ARGOPT|DFLALL|TRLBAR), RANGE|WHOLEFOLD|BANG|FILE1|ARGOPT|DFLALL|TRLBAR),
EX(CMD_vglobal, "vglobal", ex_global, EX(CMD_vglobal, "vglobal", ex_global,

View File

@@ -1677,8 +1677,8 @@ do_one_cmd(cmdlinep, sourcing,
char_u *errormsg = NULL; /* error message */ char_u *errormsg = NULL; /* error message */
exarg_T ea; /* Ex command arguments */ exarg_T ea; /* Ex command arguments */
long verbose_save = -1; long verbose_save = -1;
int save_msg_scroll = 0; int save_msg_scroll = msg_scroll;
int did_silent = 0; int save_msg_silent = -1;
int did_esilent = 0; int did_esilent = 0;
#ifdef HAVE_SANDBOX #ifdef HAVE_SANDBOX
int did_sandbox = FALSE; int did_sandbox = FALSE;
@@ -1856,9 +1856,9 @@ do_one_cmd(cmdlinep, sourcing,
} }
if (!checkforcmd(&ea.cmd, "silent", 3)) if (!checkforcmd(&ea.cmd, "silent", 3))
break; break;
++did_silent; if (save_msg_silent == -1)
save_msg_silent = msg_silent;
++msg_silent; ++msg_silent;
save_msg_scroll = msg_scroll;
if (*ea.cmd == '!' && !vim_iswhite(ea.cmd[-1])) if (*ea.cmd == '!' && !vim_iswhite(ea.cmd[-1]))
{ {
/* ":silent!", but not "silent !cmd" */ /* ":silent!", but not "silent !cmd" */
@@ -1886,6 +1886,13 @@ do_one_cmd(cmdlinep, sourcing,
#endif #endif
continue; continue;
case 'u': if (!checkforcmd(&ea.cmd, "unsilent", 3))
break;
if (save_msg_silent == -1)
save_msg_silent = msg_silent;
msg_silent = 0;
continue;
case 'v': if (checkforcmd(&ea.cmd, "vertical", 4)) case 'v': if (checkforcmd(&ea.cmd, "vertical", 4))
{ {
#ifdef FEAT_VERTSPLIT #ifdef FEAT_VERTSPLIT
@@ -2684,13 +2691,12 @@ doend:
cmdmod = save_cmdmod; cmdmod = save_cmdmod;
if (did_silent > 0) if (save_msg_silent != -1)
{ {
/* messages could be enabled for a serious error, need to check if the /* messages could be enabled for a serious error, need to check if the
* counters don't become negative */ * counters don't become negative */
msg_silent -= did_silent; if (!did_emsg)
if (msg_silent < 0) msg_silent = save_msg_silent;
msg_silent = 0;
emsg_silent -= did_esilent; emsg_silent -= did_esilent;
if (emsg_silent < 0) if (emsg_silent < 0)
emsg_silent = 0; emsg_silent = 0;
@@ -2987,6 +2993,7 @@ static struct cmdmod
{"silent", 3, FALSE}, {"silent", 3, FALSE},
{"tab", 3, TRUE}, {"tab", 3, TRUE},
{"topleft", 2, FALSE}, {"topleft", 2, FALSE},
{"unsilent", 3, FALSE},
{"verbose", 4, TRUE}, {"verbose", 4, TRUE},
{"vertical", 4, FALSE}, {"vertical", 4, FALSE},
}; };

View File

@@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
223,
/**/ /**/
222, 222,
/**/ /**/