pkgs/vim/patches/vim-7.3.064.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.064
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.064
  11 Problem:    Win32: ":dis +" shows nothing, but "+p does insert text.
  12 Solution:   Display the * register, since that's what will be inserted.
  13             (Christian Brabandt)
  14 Files:      src/globals.h, src/ops.c
  15
  16
  17 *** ../vim-7.3.063/src/globals.h        2010-08-15 21:57:27.000000000 +0200
  18 --- src/globals.h       2010-11-24 14:06:47.000000000 +0100
  19 ***************
  20 *** 510,515 ****
  21 --- 510,516 ----
  22   EXTERN VimClipboard clip_plus;        /* CLIPBOARD selection in X11 */
  23   # else
  24   #  define clip_plus clip_star /* there is only one clipboard */
  25 + #  define ONE_CLIPBOARD
  26   # endif
  27   EXTERN int    clip_unnamed INIT(= FALSE);
  28   EXTERN int    clip_autoselect INIT(= FALSE);
  29 *** ../vim-7.3.063/src/ops.c    2010-10-09 17:21:42.000000000 +0200
  30 --- src/ops.c   2010-11-24 14:26:25.000000000 +0100
  31 ***************
  32 *** 3979,3985 ****
  33       for (i = -1; i < NUM_REGISTERS && !got_int; ++i)
  34       {
  35         name = get_register_name(i);
  36 !       if (arg != NULL && vim_strchr(arg, name) == NULL)
  37             continue;       /* did not ask for this register */
  38
  39   #ifdef FEAT_CLIPBOARD
  40 --- 3979,3990 ----
  41       for (i = -1; i < NUM_REGISTERS && !got_int; ++i)
  42       {
  43         name = get_register_name(i);
  44 !       if (arg != NULL && vim_strchr(arg, name) == NULL
  45 ! #ifdef ONE_CLIPBOARD
  46 !           /* Star register and plus register contain the same thing. */
  47 !               && (name != '*' || vim_strchr(arg, '+') == NULL)
  48 ! #endif
  49 !               )
  50             continue;       /* did not ask for this register */
  51
  52   #ifdef FEAT_CLIPBOARD
  53 *** ../vim-7.3.063/src/version.c        2010-11-24 12:35:14.000000000 +0100
  54 --- src/version.c       2010-11-24 14:24:03.000000000 +0100
  55 ***************
  56 *** 716,717 ****
  57 --- 716,719 ----
  58   {   /* Add new patch number below this line */
  59 + /**/
  60 +     64,
  61   /**/
  62
  63 --
  64 FIRST SOLDIER:  So they wouldn't be able to bring a coconut back anyway.
  65 SECOND SOLDIER: Wait a minute! Suppose two swallows carried it together?
  66 FIRST SOLDIER:  No, they'd have to have it on a line.
  67                  "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
  68
  69  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  70 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  71 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  72  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///