6.2.212

   1 To: vim-dev@vim.org
   2 Subject: Patch 6.2.212
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=ISO-8859-1
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 6.2.212 (after 6.2.199)
  11 Problem:    NetBeans: Replacing with a count is not handled correctly.
  12 Solution:   Move reporting the change outside of the loop for the count.
  13             (Gordon Prieur)
  14 Files:      src/normal.c
  15
  16
  17 *** ../vim-6.2.211/src/normal.c Sun Jan 25 19:40:26 2004
  18 --- src/normal.c        Tue Jan 27 17:06:04 2004
  19 ***************
  20 *** 6134,6149 ****
  21                             || cap->nchar == ']'))
  22                     showmatch();
  23                 ++curwin->w_cursor.col;
  24   #ifdef FEAT_NETBEANS_INTG
  25 !               if (usingNetbeans)
  26 !               {
  27 !                   colnr_T start = (colnr_T)(curwin->w_cursor.col
  28 !                                                              - cap->count1);
  29 !                   netbeans_inserted(curbuf, curwin->w_cursor.lnum, start,
  30 !                            (int)cap->count1, &ptr[start], (int)cap->count1);
  31 !               }
  32 ! #endif
  33             }
  34
  35             /* mark the buffer as changed and prepare for displaying */
  36             changed_bytes(curwin->w_cursor.lnum,
  37 --- 6134,6149 ----
  38                             || cap->nchar == ']'))
  39                     showmatch();
  40                 ++curwin->w_cursor.col;
  41 +           }
  42   #ifdef FEAT_NETBEANS_INTG
  43 !           if (usingNetbeans)
  44 !           {
  45 !               colnr_T start = (colnr_T)(curwin->w_cursor.col - cap->count1);
  46 !
  47 !               netbeans_inserted(curbuf, curwin->w_cursor.lnum, start,
  48 !                       (int)cap->count1, &ptr[start], (int)cap->count1);
  49             }
  50 + #endif
  51
  52             /* mark the buffer as changed and prepare for displaying */
  53             changed_bytes(curwin->w_cursor.lnum,
  54 *** ../vim-6.2.211/src/version.c        Sun Jan 25 20:45:55 2004
  55 --- src/version.c       Tue Jan 27 17:08:48 2004
  56 ***************
  57 *** 639,640 ****
  58 --- 639,642 ----
  59   {   /* Add new patch number below this line */
  60 + /**/
  61 +     212,
  62   /**/
  63
  64 --
  65 DENNIS: Oh, very nice. King, eh!  I expect you've got a palace and fine
  66         clothes and courtiers and plenty of food.  And how d'you get that?  By
  67         exploiting the workers! By hanging on to outdated imperialist dogma
  68         which perpetuates the social and economic differences in our society!
  69                  "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
  70
  71  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  72 ///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  73 \\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
  74  \\\  Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html  ///