diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-11-24 14:28:58 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-11-24 14:28:58 +0100 |
| commit | 0818b87cbf7c0faf681775dae841aae41497758b (patch) | |
| tree | 91b050dbdcf08efe56b129cbb5aee0b39481c8a7 | |
| parent | 96e5ceed93ea55cf80f76f51407ba840cf7a820d (diff) | |
| download | vim-0818b87cbf7c0faf681775dae841aae41497758b.zip | |
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)
| -rw-r--r-- | src/globals.h | 1 | ||||
| -rw-r--r-- | src/ops.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/globals.h b/src/globals.h index 93f151429..82731f9ab 100644 --- a/src/globals.h +++ b/src/globals.h @@ -510,6 +510,7 @@ EXTERN VimClipboard clip_star; /* PRIMARY selection in X11 */ 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); @@ -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 diff --git a/src/version.c b/src/version.c index 37c5af2de..df30ef81f 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 */ /**/ + 64, +/**/ 63, /**/ 62, |