summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-10-19 14:20:54 +0000
committerBram Moolenaar <Bram@vim.org>2007-10-19 14:20:54 +0000
commitc188b88040b10b62871f51254350b226318885cd (patch)
treed19fde783cb83e06f1d3ce0e7e3cdef42dea8ad4
parent2dd8b521bb07b188bb027481c6acb77bf3ea444e (diff)
downloadvim-git-7.1.142.tar.gz
updated for version 7.1-142v7.1.142
-rw-r--r--src/ex_docmd.c18
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 11 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 72b939bdb..44a1bd695 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -8426,21 +8426,17 @@ ex_redir(eap)
|| *arg == '"')
{
redir_reg = *arg++;
- if (*arg == '>' && arg[1] == '>')
+ if (*arg == '>' && arg[1] == '>') /* append */
arg += 2;
- else if ((*arg == NUL || (*arg == '>' && arg[1] == NUL)) &&
- (islower(redir_reg)
-# ifdef FEAT_CLIPBOARD
- || redir_reg == '*'
- || redir_reg == '+'
-# endif
- || redir_reg == '"'))
+ else
{
+ /* Can use both "@a" and "@a>". */
if (*arg == '>')
arg++;
-
- /* make register empty */
- write_reg_contents(redir_reg, (char_u *)"", -1, FALSE);
+ /* Make register empty when not using @A-@Z and the
+ * command is valid. */
+ if (*arg == NUL && !isupper(redir_reg))
+ write_reg_contents(redir_reg, (char_u *)"", -1, FALSE);
}
}
if (*arg != NUL)
diff --git a/src/version.c b/src/version.c
index 5b9ad74be..daa1b0b20 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 142,
+/**/
141,
/**/
140,