|
 |
1d7b79b |
To: vim_dev@googlegroups.com
|
|
|
1d7b79b |
Subject: Patch 7.3.064
|
|
|
1d7b79b |
Fcc: outbox
|
|
|
1d7b79b |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
1d7b79b |
Mime-Version: 1.0
|
|
|
1d7b79b |
Content-Type: text/plain; charset=UTF-8
|
|
|
1d7b79b |
Content-Transfer-Encoding: 8bit
|
|
|
1d7b79b |
------------
|
|
|
1d7b79b |
|
|
|
1d7b79b |
Patch 7.3.064
|
|
|
1d7b79b |
Problem: Win32: ":dis +" shows nothing, but "+p does insert text.
|
|
|
1d7b79b |
Solution: Display the * register, since that's what will be inserted.
|
|
|
1d7b79b |
(Christian Brabandt)
|
|
|
1d7b79b |
Files: src/globals.h, src/ops.c
|
|
|
1d7b79b |
|
|
|
1d7b79b |
|
|
|
1d7b79b |
*** ../vim-7.3.063/src/globals.h 2010-08-15 21:57:27.000000000 +0200
|
|
|
1d7b79b |
--- src/globals.h 2010-11-24 14:06:47.000000000 +0100
|
|
|
1d7b79b |
***************
|
|
|
1d7b79b |
*** 510,515 ****
|
|
|
1d7b79b |
--- 510,516 ----
|
|
|
1d7b79b |
EXTERN VimClipboard clip_plus; /* CLIPBOARD selection in X11 */
|
|
|
1d7b79b |
# else
|
|
|
1d7b79b |
# define clip_plus clip_star /* there is only one clipboard */
|
|
|
1d7b79b |
+ # define ONE_CLIPBOARD
|
|
|
1d7b79b |
# endif
|
|
|
1d7b79b |
EXTERN int clip_unnamed INIT(= FALSE);
|
|
|
1d7b79b |
EXTERN int clip_autoselect INIT(= FALSE);
|
|
|
1d7b79b |
*** ../vim-7.3.063/src/ops.c 2010-10-09 17:21:42.000000000 +0200
|
|
|
1d7b79b |
--- src/ops.c 2010-11-24 14:26:25.000000000 +0100
|
|
|
1d7b79b |
***************
|
|
|
1d7b79b |
*** 3979,3985 ****
|
|
|
1d7b79b |
for (i = -1; i < NUM_REGISTERS && !got_int; ++i)
|
|
|
1d7b79b |
{
|
|
|
1d7b79b |
name = get_register_name(i);
|
|
|
1d7b79b |
! if (arg != NULL && vim_strchr(arg, name) == NULL)
|
|
|
1d7b79b |
continue; /* did not ask for this register */
|
|
|
1d7b79b |
|
|
|
1d7b79b |
#ifdef FEAT_CLIPBOARD
|
|
|
1d7b79b |
--- 3979,3990 ----
|
|
|
1d7b79b |
for (i = -1; i < NUM_REGISTERS && !got_int; ++i)
|
|
|
1d7b79b |
{
|
|
|
1d7b79b |
name = get_register_name(i);
|
|
|
1d7b79b |
! if (arg != NULL && vim_strchr(arg, name) == NULL
|
|
|
1d7b79b |
! #ifdef ONE_CLIPBOARD
|
|
|
1d7b79b |
! /* Star register and plus register contain the same thing. */
|
|
|
1d7b79b |
! && (name != '*' || vim_strchr(arg, '+') == NULL)
|
|
|
1d7b79b |
! #endif
|
|
|
1d7b79b |
! )
|
|
|
1d7b79b |
continue; /* did not ask for this register */
|
|
|
1d7b79b |
|
|
|
1d7b79b |
#ifdef FEAT_CLIPBOARD
|
|
|
1d7b79b |
*** ../vim-7.3.063/src/version.c 2010-11-24 12:35:14.000000000 +0100
|
|
|
1d7b79b |
--- src/version.c 2010-11-24 14:24:03.000000000 +0100
|
|
|
1d7b79b |
***************
|
|
|
1d7b79b |
*** 716,717 ****
|
|
|
1d7b79b |
--- 716,719 ----
|
|
|
1d7b79b |
{ /* Add new patch number below this line */
|
|
|
1d7b79b |
+ /**/
|
|
|
1d7b79b |
+ 64,
|
|
|
1d7b79b |
/**/
|
|
|
1d7b79b |
|
|
|
1d7b79b |
--
|
|
|
1d7b79b |
FIRST SOLDIER: So they wouldn't be able to bring a coconut back anyway.
|
|
|
1d7b79b |
SECOND SOLDIER: Wait a minute! Suppose two swallows carried it together?
|
|
|
1d7b79b |
FIRST SOLDIER: No, they'd have to have it on a line.
|
|
|
1d7b79b |
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
|
|
1d7b79b |
|
|
|
1d7b79b |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
1d7b79b |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
1d7b79b |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
1d7b79b |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|