Mercurial > vim
changeset 2644:e856f9cc2aee v7.3.064
updated for version 7.3.064
Problem: Win32: ":dis +" shows nothing, but "+p does insert text.
Solution: Display the * register, since that's what will be inserted.
(Christian Brabandt)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 24 Nov 2010 14:28:58 +0100 |
| parents | e6372ac3ebe5 |
| children | a2271decbce5 |
| files | src/globals.h src/ops.c src/version.c |
| diffstat | 3 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/globals.h +++ b/src/globals.h @@ -510,6 +510,7 @@ EXTERN VimClipboard clip_star; /* PRIMAR EXTERN VimClipboard clip_plus; /* CLIPBOARD selection in X11 */ # else # define clip_plus clip_star /* there is only one clipboard */ +# define ONE_CLIPBOARD # endif EXTERN int clip_unnamed INIT(= FALSE); EXTERN int clip_autoselect INIT(= FALSE);
--- a/src/ops.c +++ b/src/ops.c @@ -3979,7 +3979,12 @@ ex_display(eap) for (i = -1; i < NUM_REGISTERS && !got_int; ++i) { name = get_register_name(i); - if (arg != NULL && vim_strchr(arg, name) == NULL) + if (arg != NULL && vim_strchr(arg, name) == NULL +#ifdef ONE_CLIPBOARD + /* Star register and plus register contain the same thing. */ + && (name != '*' || vim_strchr(arg, '+') == NULL) +#endif + ) continue; /* did not ask for this register */ #ifdef FEAT_CLIPBOARD