vim/patches/vim-7.3.318.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.318
   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.318
  11 Problem:    "C" on the last line deletes that line if it's blank.
  12 Solution:   Only delete the last line for a delete operation. (James Vega)
  13 Files:      src/ops.c
  14
  15
  16 *** ../vim-7.3.317/src/ops.c    2011-08-10 12:10:55.000000000 +0200
  17 --- src/ops.c   2011-09-21 17:32:36.000000000 +0200
  18 ***************
  19 *** 1922,1928 ****
  20                     curwin->w_cursor.coladd = 0;
  21             }
  22   #endif
  23 !           if (oap->inclusive && oap->end.lnum == curbuf->b_ml.ml_line_count
  24                     && n > (int)STRLEN(ml_get(oap->end.lnum)))
  25             {
  26                 /* Special case: gH<Del> deletes the last line. */
  27 --- 1922,1930 ----
  28                     curwin->w_cursor.coladd = 0;
  29             }
  30   #endif
  31 !           if (oap->op_type == OP_DELETE
  32 !                   && oap->inclusive
  33 !                   && oap->end.lnum == curbuf->b_ml.ml_line_count
  34                     && n > (int)STRLEN(ml_get(oap->end.lnum)))
  35             {
  36                 /* Special case: gH<Del> deletes the last line. */
  37 ***************
  38 *** 3331,3338 ****
  39         if (regname == '=')
  40         {
  41             /* For the = register we need to split the string at NL
  42 !            * characters. */
  43 !           /* Loop twice: count the number of lines and save them. */
  44             for (;;)
  45             {
  46                 y_size = 0;
  47 --- 3333,3340 ----
  48         if (regname == '=')
  49         {
  50             /* For the = register we need to split the string at NL
  51 !            * characters.
  52 !            * Loop twice: count the number of lines and save them. */
  53             for (;;)
  54             {
  55                 y_size = 0;
  56 ***************
  57 *** 3348,3354 ****
  58                         if (y_array != NULL)
  59                             *ptr = NUL;
  60                         ++ptr;
  61 !                       /* A trailing '\n' makes the string linewise */
  62                         if (*ptr == NUL)
  63                         {
  64                             y_type = MLINE;
  65 --- 3350,3356 ----
  66                         if (y_array != NULL)
  67                             *ptr = NUL;
  68                         ++ptr;
  69 !                       /* A trailing '\n' makes the register linewise. */
  70                         if (*ptr == NUL)
  71                         {
  72                             y_type = MLINE;
  73 *** ../vim-7.3.317/src/version.c        2011-09-21 17:15:34.000000000 +0200
  74 --- src/version.c       2011-09-21 17:31:48.000000000 +0200
  75 ***************
  76 *** 711,712 ****
  77 --- 711,714 ----
  78   {   /* Add new patch number below this line */
  79 + /**/
  80 +     318,
  81   /**/
  82
  83 --
  84 hundred-and-one symptoms of being an internet addict:
  85 26. You check your mail. It says "no new messages." So you check it again.
  86
  87  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  88 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  89 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  90  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///