Karsten Hopp 44ad54
To: vim-dev@vim.org
Karsten Hopp 44ad54
Subject: Patch 7.2.376
Karsten Hopp 44ad54
Fcc: outbox
Karsten Hopp 44ad54
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 44ad54
Mime-Version: 1.0
Karsten Hopp 44ad54
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 44ad54
Content-Transfer-Encoding: 8bit
Karsten Hopp 44ad54
------------
Karsten Hopp 44ad54
Karsten Hopp 44ad54
Patch 7.2.376
Karsten Hopp 44ad54
Problem:    ml_get error when using SiSU syntax. (Nathan Thomas)
Karsten Hopp 44ad54
Solution:   If the match ends below the last line move it to the end of the
Karsten Hopp 44ad54
	    last line.
Karsten Hopp 44ad54
Files:	    src/syntax.c
Karsten Hopp 44ad54
Karsten Hopp 44ad54
Karsten Hopp 44ad54
*** ../vim-7.2.375/src/syntax.c	2010-01-19 14:59:14.000000000 +0100
Karsten Hopp 44ad54
--- src/syntax.c	2010-02-24 17:14:13.000000000 +0100
Karsten Hopp 44ad54
***************
Karsten Hopp 44ad54
*** 3086,3091 ****
Karsten Hopp 44ad54
--- 3086,3097 ----
Karsten Hopp 44ad54
  	col = regmatch->startpos[0].col;
Karsten Hopp 44ad54
  	off = spp->sp_offsets[idx];
Karsten Hopp 44ad54
      }
Karsten Hopp 44ad54
+     if (result->lnum > syn_buf->b_ml.ml_line_count)
Karsten Hopp 44ad54
+     {
Karsten Hopp 44ad54
+ 	/* a "\n" at the end of the pattern may take us below the last line */
Karsten Hopp 44ad54
+ 	result->lnum = syn_buf->b_ml.ml_line_count;
Karsten Hopp 44ad54
+ 	col = STRLEN(ml_get_buf(syn_buf, result->lnum, FALSE));
Karsten Hopp 44ad54
+     }
Karsten Hopp 44ad54
      if (off != 0)
Karsten Hopp 44ad54
      {
Karsten Hopp 44ad54
  	base = ml_get_buf(syn_buf, result->lnum, FALSE);
Karsten Hopp 44ad54
*** ../vim-7.2.375/src/version.c	2010-02-24 16:58:30.000000000 +0100
Karsten Hopp 44ad54
--- src/version.c	2010-02-24 17:15:48.000000000 +0100
Karsten Hopp 44ad54
***************
Karsten Hopp 44ad54
*** 683,684 ****
Karsten Hopp 44ad54
--- 683,686 ----
Karsten Hopp 44ad54
  {   /* Add new patch number below this line */
Karsten Hopp 44ad54
+ /**/
Karsten Hopp 44ad54
+     376,
Karsten Hopp 44ad54
  /**/
Karsten Hopp 44ad54
Karsten Hopp 44ad54
-- 
Karsten Hopp 44ad54
press CTRL-ALT-DEL for more information
Karsten Hopp 44ad54
Karsten Hopp 44ad54
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 44ad54
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 44ad54
\\\        download, build and distribute -- http://www.A-A-P.org        ///
Karsten Hopp 44ad54
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///