diff options
author | Bram Moolenaar <Bram@vim.org> | 2010-12-02 21:43:16 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2010-12-02 21:43:16 +0100 |
commit | bf9680e441f09a6b90ad3185154474442d363a55 (patch) | |
tree | aa05b7bbba40793abb8878d5850318c9223d2dd0 /src | |
parent | 863053d1d4b1508c6e4285f01c2d743d7a211ea4 (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')
-rw-r--r-- | src/eval.c | 3 | ||||
-rw-r--r-- | src/globals.h | 6 | ||||
-rw-r--r-- | src/ops.c | 24 | ||||
-rw-r--r-- | src/option.c | 10 | ||||
-rw-r--r-- | src/version.c | 2 |
5 files changed, 36 insertions, 9 deletions
diff --git a/src/eval.c b/src/eval.c index 356461742b..a17d743e81 100644 --- a/src/eval.c +++ b/src/eval.c @@ -12135,6 +12135,9 @@ f_has(argvars, rettv) #ifdef FEAT_TOOLBAR "toolbar", #endif +#if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) + "unnamedplus", +#endif #ifdef FEAT_USR_CMDS "user-commands", /* was accidentally included in 5.4 */ "user_commands", diff --git a/src/globals.h b/src/globals.h index 82731f9ab8..84aaa06ada 100644 --- a/src/globals.h +++ b/src/globals.h @@ -512,7 +512,11 @@ EXTERN VimClipboard clip_plus; /* CLIPBOARD selection in X11 */ # define clip_plus clip_star /* there is only one clipboard */ # define ONE_CLIPBOARD # endif -EXTERN int clip_unnamed INIT(= FALSE); + +#define CLIP_UNNAMED 1 +#define CLIP_UNNAMED_PLUS 2 +EXTERN int clip_unnamed INIT(= 0); /* above two values or'ed */ + EXTERN int clip_autoselect INIT(= FALSE); EXTERN int clip_autoselectml INIT(= FALSE); EXTERN int clip_html INIT(= FALSE); @@ -1584,9 +1584,11 @@ cmdline_paste_reg(regname, literally, remcr) adjust_clip_reg(rp) int *rp; { - /* If no reg. specified, and "unnamed" is in 'clipboard', use '*' reg. */ - if (*rp == 0 && clip_unnamed) - *rp = '*'; + /* If no reg. specified, and "unnamed" or "unnamedplus" is in 'clipboard', + * use '*' or '+' reg, respectively. "unnamedplus" prevails. */ + if (*rp == 0 && clip_unnamed != 0) + *rp = ((clip_unnamed & CLIP_UNNAMED_PLUS) && clip_plus.available) + ? '+' : '*'; if (!clip_star.available && *rp == '*') *rp = 0; if (!clip_plus.available && *rp == '+') @@ -2842,6 +2844,7 @@ op_yank(oap, deleting, mess) char_u *p; char_u *pnew; struct block_def bd; + int did_star = FALSE; /* check for read-only register */ if (oap->regname != 0 && !valid_yank_reg(oap->regname, TRUE)) @@ -3115,7 +3118,8 @@ op_yank(oap, deleting, mess) */ if (clip_star.available && (curr == &(y_regs[STAR_REGISTER]) - || (!deleting && oap->regname == 0 && clip_unnamed))) + || (!deleting && oap->regname == 0 + && (clip_unnamed & CLIP_UNNAMED)))) { if (curr != &(y_regs[STAR_REGISTER])) /* Copy the text from register 0 to the clipboard register. */ @@ -3123,6 +3127,7 @@ op_yank(oap, deleting, mess) clip_own_selection(&clip_star); clip_gen_set_selection(&clip_star); + did_star = TRUE; } # ifdef FEAT_X11 @@ -3130,12 +3135,19 @@ op_yank(oap, deleting, mess) * If we were yanking to the '+' register, send result to selection. * Also copy to the '*' register, in case auto-select is off. */ - else if (clip_plus.available && curr == &(y_regs[PLUS_REGISTER])) + if (clip_plus.available + && (curr == &(y_regs[PLUS_REGISTER]) + || (!deleting && oap->regname == 0 + && (clip_unnamed & CLIP_UNNAMED_PLUS)))) { + if (curr != &(y_regs[PLUS_REGISTER])) + /* Copy the text from register 0 to the clipboard register. */ + copy_yank_reg(&(y_regs[PLUS_REGISTER])); + /* No need to copy to * register upon 'unnamed' now - see below */ clip_own_selection(&clip_plus); clip_gen_set_selection(&clip_plus); - if (!clip_isautosel()) + if (!clip_isautosel() && !did_star) { copy_yank_reg(&(y_regs[STAR_REGISTER])); clip_own_selection(&clip_star); 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)) { diff --git a/src/version.c b/src/version.c index 9d414e8030..f400d1c668 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 74, +/**/ 73, /**/ 72, |