6.2.086

   1 To: vim-dev@vim.org
   2 Subject: Patch 6.2.086
   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.086
  11 Problem:    "{" and "}" stop inside a closed fold.
  12 Solution:   Only stop once inside a closed fold. (Stephen Riehm)
  13 Files:      src/search.c
  14
  15
  16 *** ../vim-6.2.085/src/search.c Sun May 18 19:31:28 2003
  17 --- src/search.c        Sun Sep  7 22:47:43 2003
  18 ***************
  19 *** 2351,2356 ****
  20 --- 2355,2366 ----
  21       linenr_T  curr;
  22       int               did_skip;   /* TRUE after separating lines have been skipped */
  23       int               first;      /* TRUE on first line */
  24 + #ifdef FEAT_FOLDING
  25 +     linenr_T  fold_first; /* first line of a closed fold */
  26 +     linenr_T  fold_last;  /* last line of a closed fold */
  27 +     int               fold_skipped; /* TRUE if a closed fold was skipped this
  28 +                                iteration */
  29 + #endif
  30
  31       curr = curwin->w_cursor.lnum;
  32
  33 ***************
  34 *** 2362,2370 ****
  35 --- 2372,2394 ----
  36             if (*ml_get(curr) != NUL)
  37                 did_skip = TRUE;
  38
  39 + #ifdef FEAT_FOLDING
  40 +           /* skip folded lines */
  41 +           fold_skipped = FALSE;
  42 +           while (hasFolding(curr, &fold_first, &fold_last))
  43 +           {
  44 +               curr = ((dir > 0) ? fold_last : fold_first) + dir;
  45 +               fold_skipped = TRUE;
  46 +           }
  47 + #endif
  48 +
  49             if (!first && did_skip && startPS(curr, what, both))
  50                 break;
  51
  52 + #ifdef FEAT_FOLDING
  53 +           if (fold_skipped)
  54 +               curr -= dir;
  55 + #endif
  56             if ((curr += dir) < 1 || curr > curbuf->b_ml.ml_line_count)
  57             {
  58                 if (count)
  59 *** ../vim-6.2.085/src/version.c        Thu Sep 11 21:25:44 2003
  60 --- src/version.c       Thu Sep 11 21:28:46 2003
  61 ***************
  62 *** 632,633 ****
  63 --- 632,635 ----
  64   {   /* Add new patch number below this line */
  65 + /**/
  66 +     86,
  67   /**/
  68
  69 --
  70 Close your shells, or I'll kill -9 you
  71 Tomorrow I'll quota you
  72 Remember the disks'll always be full
  73 And then while I'm away
  74 I'll write ~ everyday
  75 And I'll send-pr all my buggings to you.
  76     [ CVS log "Beatles style" for FreeBSD ports/INDEX, Satoshi Asami ]
  77
  78  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  79 ///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
  80 \\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
  81  \\\  Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html  ///