aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

updated for version 7.3.064

Browse Source 
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:
Bram Moolenaar
2010-11-24 14:28:58 +01:00
parent 96e5ceed93
commit 0818b87cbf
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/globals.h
View File

@@ -510,6 +510,7 @@ EXTERN VimClipboard clip_star; /* PRIMARY selection in X11 */
EXTERN VimClipboard clip_plus; /* CLIPBOARD selection in X11 */ EXTERN VimClipboard clip_plus; /* CLIPBOARD selection in X11 */
# else # else
# define clip_plus clip_star /* there is only one clipboard */ # define clip_plus clip_star /* there is only one clipboard */
# define ONE_CLIPBOARD
# endif # endif
EXTERN int clip_unnamed INIT(= FALSE); EXTERN int clip_unnamed INIT(= FALSE);
EXTERN int clip_autoselect INIT(= FALSE); EXTERN int clip_autoselect INIT(= FALSE);

7
src/ops.c
View File

@@ -3979,7 +3979,12 @@ ex_display(eap)
for (i = -1; i < NUM_REGISTERS && !got_int; ++i) for (i = -1; i < NUM_REGISTERS && !got_int; ++i)
{ {
name = get_register_name(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 */ continue; /* did not ask for this register */
#ifdef FEAT_CLIPBOARD #ifdef FEAT_CLIPBOARD

2
src/version.c
View File

@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
64,
/**/ /**/
63, 63,
/**/ /**/