From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 24 Nov 2010 13:28:58 +0000 (+0100)
Subject: updated for version 7.3.064
X-Git-Tag: v7.3.064
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0818b87cbf7c0faf681775dae841aae41497758b;p=vim

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 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);
diff --git a/src/ops.c b/src/ops.c
index cf5d1b13c..04ef069d5 100644
--- 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 37c5af2de..df30ef81f 100644
--- 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,
 /**/