equal
deleted
inserted
replaced
1 To: [email protected] |
|
2 Subject: Patch 7.2.376 |
|
3 Fcc: outbox |
|
4 From: Bram Moolenaar <[email protected]> |
|
5 Mime-Version: 1.0 |
|
6 Content-Type: text/plain; charset=UTF-8 |
|
7 Content-Transfer-Encoding: 8bit |
|
8 ------------ |
|
9 |
|
10 Patch 7.2.376 |
|
11 Problem: ml_get error when using SiSU syntax. (Nathan Thomas) |
|
12 Solution: If the match ends below the last line move it to the end of the |
|
13 last line. |
|
14 Files: src/syntax.c |
|
15 |
|
16 |
|
17 *** ../vim-7.2.375/src/syntax.c 2010-01-19 14:59:14.000000000 +0100 |
|
18 --- src/syntax.c 2010-02-24 17:14:13.000000000 +0100 |
|
19 *************** |
|
20 *** 3086,3091 **** |
|
21 --- 3086,3097 ---- |
|
22 col = regmatch->startpos[0].col; |
|
23 off = spp->sp_offsets[idx]; |
|
24 } |
|
25 + if (result->lnum > syn_buf->b_ml.ml_line_count) |
|
26 + { |
|
27 + /* a "\n" at the end of the pattern may take us below the last line */ |
|
28 + result->lnum = syn_buf->b_ml.ml_line_count; |
|
29 + col = STRLEN(ml_get_buf(syn_buf, result->lnum, FALSE)); |
|
30 + } |
|
31 if (off != 0) |
|
32 { |
|
33 base = ml_get_buf(syn_buf, result->lnum, FALSE); |
|
34 *** ../vim-7.2.375/src/version.c 2010-02-24 16:58:30.000000000 +0100 |
|
35 --- src/version.c 2010-02-24 17:15:48.000000000 +0100 |
|
36 *************** |
|
37 *** 683,684 **** |
|
38 --- 683,686 ---- |
|
39 { /* Add new patch number below this line */ |
|
40 + /**/ |
|
41 + 376, |
|
42 /**/ |
|
43 |
|
44 -- |
|
45 press CTRL-ALT-DEL for more information |
|
46 |
|
47 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ |
|
48 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
|
49 \\\ download, build and distribute -- http://www.A-A-P.org /// |
|
50 \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |
|