vim/patches/vim-7.3.498.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.498
   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.498
  11 Problem:    The behavior of the "- register changes depending on value of
  12             the 'clipboard' option. (Szamotulski)
  13 Solution:   Also set the "- register when the register is "*" or "+".
  14             (Christian Brabandt)
  15 Files:      src/ops.c
  16
  17
  18 *** ../vim-7.3.497/src/ops.c    2012-03-23 14:16:19.000000000 +0100
  19 --- src/ops.c   2012-04-20 13:36:32.000000000 +0200
  20 ***************
  21 *** 1720,1728 ****
  22                 did_yank = TRUE;
  23         }
  24
  25 !       /* Yank into small delete register when no register specified and the
  26 !        * delete is within one line. */
  27 !       if (oap->regname == 0 && oap->motion_type != MLINE
  28                                                       && oap->line_count == 1)
  29         {
  30             oap->regname = '-';
  31 --- 1720,1733 ----
  32                 did_yank = TRUE;
  33         }
  34
  35 !       /* Yank into small delete register when no named register specified
  36 !        * and the delete is within one line. */
  37 !       if ((
  38 ! #ifdef FEAT_CLIPBOARD
  39 !             ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') ||
  40 !             ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') ||
  41 ! #endif
  42 !           oap->regname == 0) && oap->motion_type != MLINE
  43                                                       && oap->line_count == 1)
  44         {
  45             oap->regname = '-';
  46 *** ../vim-7.3.497/src/version.c        2012-04-20 13:31:16.000000000 +0200
  47 --- src/version.c       2012-04-20 13:45:26.000000000 +0200
  48 ***************
  49 *** 716,717 ****
  50 --- 716,719 ----
  51   {   /* Add new patch number below this line */
  52 + /**/
  53 +     498,
  54   /**/
  55
  56 --
  57 Did you ever stop to think...  and forget to start again?
  58                                   -- Steven Wright
  59
  60  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  61 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  62 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  63  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///