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)

diff --git a/src/globals.h b/src/globals.h
index 93f1514290d24848490b758e0025bd728dbb8366..82731f9ab8392967c6a72e231ac2d07c60b82aa1 100644 (file)
--- 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);

diff --git a/src/ops.c b/src/ops.c
index cf5d1b13c1c8b4b4ef6e24f47430c6b648493e34..04ef069d5a8d7b1a8470cb3f6ba3d6fcbcffe712 100644 (file)
--- 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

diff --git a/src/version.c b/src/version.c
index 37c5af2de2c0bc530c7793deafc2636fbce6aa0c..df30ef81f25e9c858cf2c86bb8d087bcbfc88fbe 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    64,
 /**/
     63,
 /**/