6.2.249

   1 To: vim-dev@vim.org
   2 Subject: Patch 6.2.249
   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.249
  11 Problem:    ":cnext" moves to the error in the next file, but there is no
  12             method to go back.
  13 Solution:   Add ":cpfile" and ":cNfile".
  14 Files:      src/ex_cmds.h, src/quickfix.c, src/vim.h, runtime/doc/quickfix.txt
  15
  16
  17 *** ../vim-6.2.248/src/ex_cmds.h        Sun Feb  8 17:07:07 2004
  18 --- src/ex_cmds.h       Tue Feb 10 15:18:46 2004
  19 ***************
  20 *** 180,185 ****
  21 --- 180,187 ----
  22                         BANG|WHOLEFOLD|RANGE|COUNT|TRLBAR|CMDWIN|MODIFY),
  23   EX(CMD_cNext,         "cNext",        ex_cnext,
  24                         RANGE|NOTADR|COUNT|TRLBAR|BANG),
  25 + EX(CMD_cNfile,                "cNfile",       ex_cnext,
  26 +                       RANGE|NOTADR|COUNT|TRLBAR|BANG),
  27   EX(CMD_cabbrev,               "cabbrev",      ex_abbreviate,
  28                         EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
  29   EX(CMD_cabclear,      "cabclear",     ex_abclear,
  30 ***************
  31 *** 251,256 ****
  32 --- 253,260 ----
  33   EX(CMD_copen,         "copen",        ex_copen,
  34                         RANGE|NOTADR|COUNT|TRLBAR),
  35   EX(CMD_cprevious,     "cprevious",    ex_cnext,
  36 +                       RANGE|NOTADR|COUNT|TRLBAR|BANG),
  37 + EX(CMD_cpfile,                "cpfile",       ex_cnext,
  38                         RANGE|NOTADR|COUNT|TRLBAR|BANG),
  39   EX(CMD_cquit,         "cquit",        ex_cquit,
  40                         TRLBAR|BANG),
  41 *** ../vim-6.2.248/src/quickfix.c       Mon Dec 29 20:21:49 2003
  42 --- src/quickfix.c      Tue Feb 10 15:24:52 2004
  43 ***************
  44 *** 970,975 ****
  45 --- 970,977 ----
  46    * jump to a quickfix line
  47    * if dir == FORWARD go "errornr" valid entries forward
  48    * if dir == BACKWARD go "errornr" valid entries backward
  49 +  * if dir == FORWARD_FILE go "errornr" valid entries files backward
  50 +  * if dir == BACKWARD_FILE go "errornr" valid entries files backward
  51    * else if "errornr" is zero, redisplay the same line
  52    * else go to entry "errornr"
  53    */
  54 ***************
  55 *** 1044,1055 ****
  56             err = NULL;
  57         }
  58       }
  59 !     else if (dir == BACKWARD)     /* previous valid entry */
  60       {
  61         while (errornr--)
  62         {
  63             old_qf_ptr = qf_ptr;
  64             prev_index = qf_index;
  65             do
  66             {
  67                 if (qf_index == 1 || qf_ptr->qf_prev == NULL)
  68 --- 1046,1058 ----
  69             err = NULL;
  70         }
  71       }
  72 !     else if (dir == BACKWARD || dir == BACKWARD_FILE)  /* prev. valid entry */
  73       {
  74         while (errornr--)
  75         {
  76             old_qf_ptr = qf_ptr;
  77             prev_index = qf_index;
  78 +           old_qf_fnum = qf_ptr->qf_fnum;
  79             do
  80             {
  81                 if (qf_index == 1 || qf_ptr->qf_prev == NULL)
  82 ***************
  83 *** 1066,1072 ****
  84                 }
  85                 --qf_index;
  86                 qf_ptr = qf_ptr->qf_prev;
  87 !           } while (!qf_lists[qf_curlist].qf_nonevalid && !qf_ptr->qf_valid);
  88             err = NULL;
  89         }
  90       }
  91 --- 1069,1076 ----
  92                 }
  93                 --qf_index;
  94                 qf_ptr = qf_ptr->qf_prev;
  95 !           } while ((!qf_lists[qf_curlist].qf_nonevalid && !qf_ptr->qf_valid)
  96 !                 || (dir == BACKWARD_FILE && qf_ptr->qf_fnum == old_qf_fnum));
  97             err = NULL;
  98         }
  99       }
 100 ***************
 101 *** 2106,2112 ****
 102             ? FORWARD
 103             : eap->cmdidx == CMD_cnfile
 104                 ? FORWARD_FILE
 105 !               : BACKWARD,
 106             eap->addr_count > 0 ? (int)eap->line2 : 1, eap->forceit);
 107   }
 108
 109 --- 2110,2118 ----
 110             ? FORWARD
 111             : eap->cmdidx == CMD_cnfile
 112                 ? FORWARD_FILE
 113 !               : (eap->cmdidx == CMD_cpfile || eap->cmdidx == CMD_cNfile)
 114 !                   ? BACKWARD_FILE
 115 !                   : BACKWARD,
 116             eap->addr_count > 0 ? (int)eap->line2 : 1, eap->forceit);
 117   }
 118
 119 *** ../vim-6.2.248/src/vim.h    Mon Feb  2 12:53:51 2004
 120 --- src/vim.h   Tue Feb 10 15:22:15 2004
 121 ***************
 122 *** 530,535 ****
 123 --- 530,536 ----
 124   #define FORWARD                       1
 125   #define BACKWARD              (-1)
 126   #define FORWARD_FILE          3
 127 + #define BACKWARD_FILE         (-3)
 128
 129   /* return values for functions */
 130   #if !(defined(OK) && (OK == 1))
 131 *** ../vim-6.2.248/runtime/doc/quickfix.txt     Sun Jun  1 12:20:34 2003
 132 --- runtime/doc/quickfix.txt    Tue Feb 10 15:17:25 2004
 133 ***************
 134 *** 1,4 ****
 135 ! *quickfix.txt*  For Vim version 6.2.  Last change: 2003 May 30
 136
 137
 138                   VIM REFERENCE MANUAL    by Bram Moolenaar
 139 --- 1,4 ----
 140 ! *quickfix.txt*  For Vim version 6.2.  Last change: 2004 Feb 10
 141
 142
 143                   VIM REFERENCE MANUAL    by Bram Moolenaar
 144 ***************
 145 *** 70,75 ****
 146 --- 70,82 ----
 147                         the [count] next error.  See |:cc| for [!] and
 148                         'switchbuf'.
 149
 150 + :[count]cNf[ile][!]                   *:cpf* *:cpfile* *:cNf* *:cNfile*
 151 + :[count]cpf[ile][!]   Display the last error in the [count] previous file in
 152 +                       the list that includes a file name.  If there are no
 153 +                       file names at all or if there is no next file, go to
 154 +                       the [count] previous error.  See |:cc| for [!] and
 155 +                       'switchbuf'.
 156 +
 157                                                         *:crewind* *:cr*
 158   :cr[ewind][!] [nr]    Display error [nr].  If [nr] is omitted, the FIRST
 159                         error is displayed.  See |:cc|.
 160 *** ../vim-6.2.248/src/version.c        Mon Feb  9 18:45:58 2004
 161 --- src/version.c       Tue Feb 10 19:31:39 2004
 162 ***************
 163 *** 639,640 ****
 164 --- 639,642 ----
 165   {   /* Add new patch number below this line */
 166 + /**/
 167 +     249,
 168   /**/
 169
 170 --
 171 I AM THANKFUL...
 172 ...for the taxes that I pay because it means that I am employed.
 173
 174  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 175 ///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 176 \\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 177  \\\  Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html  ///