7.3.205

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.205
   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.205
  11 Problem:    Syntax "extend" doesn't work correctly.
  12 Solution:   Avoid calling check_state_ends() recursively (Ben Schmidt)
  13 Files:      src/syntax.c
  14
  15
  16 *** ../mercurial/vim73/src/syntax.c     2011-05-19 12:14:03.000000000 +0200
  17 --- src/syntax.c        2011-05-25 17:47:46.000000000 +0200
  18 ***************
  19 *** 990,996 ****
  20 --- 990,999 ----
  21        * previous line and regions that have "keepend".
  22        */
  23       if (current_state.ga_len > 0)
  24 +     {
  25         syn_update_ends(TRUE);
  26 +       check_state_ends();
  27 +     }
  28
  29       next_match_idx = -1;
  30       ++current_line_id;
  31 ***************
  32 *** 1064,1070 ****
  33         }
  34       }
  35       check_keepend();
  36 -     check_state_ends();
  37   }
  38
  39   /****************************************
  40 --- 1067,1072 ----
  41 ***************
  42 *** 2533,2539 ****
  43   check_state_ends()
  44   {
  45       stateitem_T       *cur_si;
  46 !     int               had_extend = FALSE;
  47
  48       cur_si = &CUR_STATE(current_state.ga_len - 1);
  49       for (;;)
  50 --- 2535,2541 ----
  51   check_state_ends()
  52   {
  53       stateitem_T       *cur_si;
  54 !     int               had_extend;
  55
  56       cur_si = &CUR_STATE(current_state.ga_len - 1);
  57       for (;;)
  58 ***************
  59 *** 2586,2593 ****
  60
  61                 /* When the ended item has "extend", another item with
  62                  * "keepend" now needs to check for its end. */
  63 !                if (cur_si->si_flags & HL_EXTEND)
  64 !                    had_extend = TRUE;
  65
  66                 pop_current_state();
  67
  68 --- 2588,2594 ----
  69
  70                 /* When the ended item has "extend", another item with
  71                  * "keepend" now needs to check for its end. */
  72 !                had_extend = (cur_si->si_flags & HL_EXTEND);
  73
  74                 pop_current_state();
  75
  76 *** ../vim-7.3.204/src/version.c        2011-05-25 17:29:40.000000000 +0200
  77 --- src/version.c       2011-05-25 17:52:57.000000000 +0200
  78 ***************
  79 *** 711,712 ****
  80 --- 711,714 ----
  81   {   /* Add new patch number below this line */
  82 + /**/
  83 +     205,
  84   /**/
  85
  86 --
  87 hundred-and-one symptoms of being an internet addict:
  88 110. You actually volunteer to become your employer's webmaster.
  89
  90  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  91 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  92 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  93  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///