forked from aniani/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)
This commit is contained in:
@@ -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
|
||||
|
@@ -714,6 +714,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
64,
|
||||
/**/
|
||||
63,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user