- patchlevel 376

This commit is contained in:
Karsten Hopp 2010-02-24 16:24:41 +00:00
parent e219b7583c
commit 44ad545d3b
3 changed files with 78 additions and 1 deletions

50
7.2.376 Normal file
View File

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

View File

@ -399,3 +399,11 @@ Individual patches for Vim 7.2:
3802 7.2.366 CTRL-B doesn't go back to the first line of the buffer 3802 7.2.366 CTRL-B doesn't go back to the first line of the buffer
3236 7.2.367 "xxd -r -p" doesn't work as documented 3236 7.2.367 "xxd -r -p" doesn't work as documented
1623 7.2.368 (after 7.2.361) append line with Ruby interface doesn't work 1623 7.2.368 (after 7.2.361) append line with Ruby interface doesn't work
1872 7.2.369 error message for :profile is not easy to understand
4352 7.2.370 (after 7.2.356) a redraw may cause folds to be closed
10029 7.2.371 build problems on Tandem NonStop
9674 7.2.372 (extra) cross-compiling GvimExt and xxd doesn't work.
2901 7.2.373 new messages from gcc 4.5 are not in 'errorformat'
4434 7.2.374 Ruby eval() doesn't understand Vim types
1794 7.2.375 ml_get errors when using ":bprevious" in a BufEnter autocmd
1577 7.2.376 ml_get error when using SiSU syntax

View File

@ -18,7 +18,7 @@
#used for pre-releases: #used for pre-releases:
%define beta %{nil} %define beta %{nil}
%define vimdir vim72%{?beta} %define vimdir vim72%{?beta}
%define patchlevel 368 %define patchlevel 376
Summary: The VIM editor Summary: The VIM editor
URL: http://www.vim.org/ URL: http://www.vim.org/
@ -434,6 +434,14 @@ Patch365: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.365
Patch366: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.366 Patch366: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.366
Patch367: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.367 Patch367: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.367
Patch368: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.368 Patch368: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.368
Patch369: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.369
Patch370: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.370
Patch371: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.371
Patch372: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.372
Patch373: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.373
Patch374: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.374
Patch375: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.375
Patch376: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.376
Patch3000: vim-7.0-syntax.patch Patch3000: vim-7.0-syntax.patch
Patch3002: vim-7.1-nowarnings.patch Patch3002: vim-7.1-nowarnings.patch
@ -940,6 +948,14 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch366 -p0 %patch366 -p0
%patch367 -p0 %patch367 -p0
%patch368 -p0 %patch368 -p0
%patch369 -p0
%patch370 -p0
%patch371 -p0
%patch372 -p0
%patch373 -p0
%patch374 -p0
%patch375 -p0
%patch376 -p0
# install spell files # install spell files
@ -1404,6 +1420,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/apps/*
%changelog %changelog
* Wed Feb 24 2010 Karsten Hopp <karsten@redhat.com> 7.2.376-1
- patchlevel 376
* Thu Feb 18 2010 Karsten Hopp <karsten@redhat.com> 7.2.368-1 * Thu Feb 18 2010 Karsten Hopp <karsten@redhat.com> 7.2.368-1
- patchlevel 368 - patchlevel 368