thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.171

Browse Source 
Problem:    When the clipboard isn't supported: ":yank*" gives a confusing
            error message.
Solution:   Specifically mention that the register name is invalid.
            (Jean-Rene David)
This commit is contained in:
Bram Moolenaar
2011-05-05 14:26:41 +02:00
parent 72bb0d6455
commit 85de20665f
4 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/doc/change.txt
View File

@@ -917,8 +917,10 @@ inside of strings can change! Also see 'softtabstop' option. >
{Visual}["x]Y Yank the highlighted lines [into register x] (for
{Visual} see |Visual-mode|). {not in Vi}
*:y* *:yank*
:[range]y[ank] [x] Yank [range] lines [into register x].
*:y* *:yank* *E850*
:[range]y[ank] [x] Yank [range] lines [into register x]. Yanking to the
"* or "+ registers is possible only in GUI versions or
when the |+xterm_clipboard| feature is included.
:[range]y[ank] [x] {count}
Yank {count} lines, starting with last line number

36
src/ex_docmd.c
View File

@@ -2424,25 +2424,39 @@ do_one_cmd(cmdlinep, sourcing,
if ( (ea.argt & REGSTR)
&& *ea.arg != NUL
#ifdef FEAT_USR_CMDS
&& valid_yank_reg(*ea.arg, (ea.cmdidx != CMD_put
&& USER_CMDIDX(ea.cmdidx)))
/* Do not allow register = for user commands */
&& (!USER_CMDIDX(ea.cmdidx) || *ea.arg != '=')
#else
&& valid_yank_reg(*ea.arg, ea.cmdidx != CMD_put)
#endif
&& !((ea.argt & COUNT) && VIM_ISDIGIT(*ea.arg)))
{
ea.regname = *ea.arg++;
#ifdef FEAT_EVAL
/* for '=' register: accept the rest of the line as an expression */
if (ea.arg[-1] == '=' && ea.arg[0] != NUL)
#ifndef FEAT_CLIPBOARD
/* check these explicitly for a more specific error message */
if (*ea.arg == '*' || *ea.arg == '+')
{
set_expr_line(vim_strsave(ea.arg));
ea.arg += STRLEN(ea.arg);
errormsg = (char_u *)_(e_invalidreg);
goto doend;
}
#endif
ea.arg = skipwhite(ea.arg);
if (
#ifdef FEAT_USR_CMDS
valid_yank_reg(*ea.arg, (ea.cmdidx != CMD_put
&& USER_CMDIDX(ea.cmdidx)))
#else
valid_yank_reg(*ea.arg, ea.cmdidx != CMD_put)
#endif
)
{
ea.regname = *ea.arg++;
#ifdef FEAT_EVAL
/* for '=' register: accept the rest of the line as an expression */
if (ea.arg[-1] == '=' && ea.arg[0] != NUL)
{
set_expr_line(vim_strsave(ea.arg));
ea.arg += STRLEN(ea.arg);
}
#endif
ea.arg = skipwhite(ea.arg);
}
}
/*

3
src/globals.h
View File

@@ -1561,6 +1561,9 @@ EXTERN char_u e_bufloaded[] INIT(= N_("E139: File is loaded in another buffer"))
(defined(FEAT_INS_EXPAND) && defined(FEAT_COMPL_FUNC))
EXTERN char_u e_notset[] INIT(= N_("E764: Option '%s' is not set"));
#endif
#ifndef FEAT_CLIPBOARD
EXTERN char_u e_invalidreg[] INIT(= N_("E850: Invalid register name"));
#endif
#ifdef MACOS_X_UNIX
EXTERN short disallow_gui INIT(= FALSE);

2
src/version.c
View File

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