7.2.253

   1 To: vim-dev@vim.org
   2 Subject: Patch 7.2.253
   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.2.253
  11 Problem:    Netbeans interface: getLength always uses current buffer.
  12 Solution:   Use ml_get_buf() instead of ml_get(). (Xavier de Gaye)
  13 Files:      src/netbeans.c
  14
  15
  16 *** ../vim-7.2.252/src/netbeans.c       2009-06-24 16:49:50.000000000 +0200
  17 --- src/netbeans.c      2009-09-11 13:40:14.000000000 +0200
  18 ***************
  19 *** 1499,1505 ****
  20                     return FAIL;
  21                 }
  22                 first = *pos;
  23 !               nbdebug(("    FIRST POS: line %d, col %d\n", first.lnum, first.col));
  24                 pos = off2pos(buf->bufp, off+count-1);
  25                 if (!pos)
  26                 {
  27 --- 1499,1506 ----
  28                     return FAIL;
  29                 }
  30                 first = *pos;
  31 !               nbdebug(("    FIRST POS: line %d, col %d\n",
  32 !                                                     first.lnum, first.col));
  33                 pos = off2pos(buf->bufp, off+count-1);
  34                 if (!pos)
  35                 {
  36 ***************
  37 *** 1510,1516 ****
  38                     return FAIL;
  39                 }
  40                 last = *pos;
  41 !               nbdebug(("    LAST POS: line %d, col %d\n", last.lnum, last.col));
  42                 del_from_lnum = first.lnum;
  43                 del_to_lnum = last.lnum;
  44                 doupdate = 1;
  45 --- 1511,1518 ----
  46                     return FAIL;
  47                 }
  48                 last = *pos;
  49 !               nbdebug(("    LAST POS: line %d, col %d\n",
  50 !                                                       last.lnum, last.col));
  51                 del_from_lnum = first.lnum;
  52                 del_to_lnum = last.lnum;
  53                 doupdate = 1;
  54 ***************
  55 *** 1521,1527 ****
  56                 next = off2pos(buf->bufp, off + count);
  57
  58                 /* Remove part of the first line. */
  59 !               if (first.col != 0 || (next != NULL && first.lnum == next->lnum))
  60                 {
  61                     if (first.lnum != last.lnum
  62                             || (next != NULL && first.lnum != next->lnum))
  63 --- 1523,1530 ----
  64                 next = off2pos(buf->bufp, off + count);
  65
  66                 /* Remove part of the first line. */
  67 !               if (first.col != 0
  68 !                               || (next != NULL && first.lnum == next->lnum))
  69                 {
  70                     if (first.lnum != last.lnum
  71                             || (next != NULL && first.lnum != next->lnum))
  72 ***************
  73 *** 1584,1590 ****
  74                         int id = buf_findsign_id(buf->bufp, (linenr_T)i);
  75                         if (id > 0)
  76                         {
  77 !                           nbdebug(("    Deleting sign %d on line %d\n", id, i));
  78                             buf_delsign(buf->bufp, id);
  79                         }
  80                         else
  81 --- 1587,1594 ----
  82                         int id = buf_findsign_id(buf->bufp, (linenr_T)i);
  83                         if (id > 0)
  84                         {
  85 !                           nbdebug(("    Deleting sign %d on line %d\n",
  86 !                                                                     id, i));
  87                             buf_delsign(buf->bufp, id);
  88                         }
  89                         else
  90 ***************
  91 *** 1593,1599 ****
  92                         }
  93                     }
  94
  95 !                   nbdebug(("    Deleting lines %d through %d\n", del_from_lnum, del_to_lnum));
  96                     curwin->w_cursor.lnum = del_from_lnum;
  97                     curwin->w_cursor.col = 0;
  98                     del_lines(del_to_lnum - del_from_lnum + 1, FALSE);
  99 --- 1597,1604 ----
 100                         }
 101                     }
 102
 103 !                   nbdebug(("    Deleting lines %d through %d\n",
 104 !                                                del_from_lnum, del_to_lnum));
 105                     curwin->w_cursor.lnum = del_from_lnum;
 106                     curwin->w_cursor.col = 0;
 107                     del_lines(del_to_lnum - del_from_lnum + 1, FALSE);
 108 ***************
 109 *** 3514,3520 ****
 110             eol_size = 1;
 111         for (lnum = 1; lnum <= bufp->b_ml.ml_line_count; ++lnum)
 112         {
 113 !           char_count += (long)STRLEN(ml_get(lnum)) + eol_size;
 114             /* Check for a CTRL-C every 100000 characters */
 115             if (char_count > last_check)
 116             {
 117 --- 3519,3526 ----
 118             eol_size = 1;
 119         for (lnum = 1; lnum <= bufp->b_ml.ml_line_count; ++lnum)
 120         {
 121 !           char_count += (long)STRLEN(ml_get_buf(bufp, lnum, FALSE))
 122 !                                                                  + eol_size;
 123             /* Check for a CTRL-C every 100000 characters */
 124             if (char_count > last_check)
 125             {
 126 *** ../vim-7.2.252/src/version.c        2009-09-11 14:02:25.000000000 +0200
 127 --- src/version.c       2009-09-11 14:18:45.000000000 +0200
 128 ***************
 129 *** 678,679 ****
 130 --- 678,681 ----
 131   {   /* Add new patch number below this line */
 132 + /**/
 133 +     253,
 134   /**/
 135
 136 --
 137 hundred-and-one symptoms of being an internet addict:
 138 227. You sleep next to your monitor.  Or on top of it.
 139
 140  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 141 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 142 \\\        download, build and distribute -- http://www.A-A-P.org        ///
 143  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///