summaryrefslogtreecommitdiffstats
path: root/src/option.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-12-02 21:43:16 +0100
committerBram Moolenaar <Bram@vim.org>2010-12-02 21:43:16 +0100
commitbf9680e441f09a6b90ad3185154474442d363a55 (patch)
treeaa05b7bbba40793abb8878d5850318c9223d2dd0 /src/option.c
parent863053d1d4b1508c6e4285f01c2d743d7a211ea4 (diff)
updated for version 7.3.074v7.3.074
Problem: Can't use the "+ register like "* for yank and put. Solution: Add "unnamedplus" to the 'clipboard' option. (Ivan Krasilnikov)
Diffstat (limited to 'src/option.c')
-rw-r--r--src/option.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/option.c b/src/option.c
index 419ef68ef4..87eadd04fd 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7307,7 +7307,7 @@ check_stl_option(s)
static char_u *
check_clipboard_option()
{
- int new_unnamed = FALSE;
+ int new_unnamed = 0;
int new_autoselect = FALSE;
int new_autoselectml = FALSE;
int new_html = FALSE;
@@ -7319,9 +7319,15 @@ check_clipboard_option()
{
if (STRNCMP(p, "unnamed", 7) == 0 && (p[7] == ',' || p[7] == NUL))
{
- new_unnamed = TRUE;
+ new_unnamed |= CLIP_UNNAMED;
p += 7;
}
+ else if (STRNCMP(p, "unnamedplus", 11) == 0
+ && (p[11] == ',' || p[11] == NUL))
+ {
+ new_unnamed |= CLIP_UNNAMED_PLUS;
+ p += 11;
+ }
else if (STRNCMP(p, "autoselect", 10) == 0
&& (p[10] == ',' || p[10] == NUL))
{