rpms/vim
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- patchlevel 437

Browse Source
This commit is contained in:
Karsten Hopp 2010-05-21 22:10:33 +00:00
parent 3dd1791238
commit 67a281bb7b
3 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
7.2.437 Normal file
View File

@ -0,0 +1,53 @@
To: vim-dev@vim.org
Subject: Patch 7.2.437
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.437 (after 7.2.407)
Problem: When "\\\n" appears in the expression result the \n doesn't result
in a line break. (Andy Wokula)
Solution: Also replace a \n after a backslash into \r.
Files: src/regexp.c
*** ../vim-7.2.436/src/regexp.c 2010-03-23 16:27:15.000000000 +0100
--- src/regexp.c 2010-05-21 13:06:00.000000000 +0200
***************
*** 6974,6979 ****
--- 6974,6986 ----
else if (*s == '\\' && s[1] != NUL)
{
++s;
+ /* Change NL to CR here too, so that this works:
+ * :s/abc\\\ndef/\="aaa\\\nbbb"/ on text:
+ * abc\
+ * def
+ */
+ if (*s == NL)
+ *s = CAR;
had_backslash = TRUE;
}
}
*** ../vim-7.2.436/src/version.c 2010-05-16 13:56:01.000000000 +0200
--- src/version.c 2010-05-21 13:07:50.000000000 +0200
***************
*** 683,684 ****
--- 683,686 ----
{ /* Add new patch number below this line */
+ /**/
+ 437,
/**/
--
hundred-and-one symptoms of being an internet addict:
89. In addition to your e-mail address being on your business
cards you even have your own domain.
/// 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 ///

1
README.patches
View File

@ -468,3 +468,4 @@ Individual patches for Vim 7.2:
2106 7.2.434 (after 7.2.432) compilation fails without multi-lang feature
4590 7.2.435 (after 7.2.430) crash when using bad_char_idx uninitialized
4058 7.2.436 reproducible crash in syntax HL
1605 7.2.437 (after 7.2.407) no line break for "\\\n" in expression of :s

7
vim.spec
View File

@ -18,7 +18,7 @@
#used for pre-releases:
%define beta %{nil}
%define vimdir vim72%{?beta}
%define patchlevel 436
%define patchlevel 437
Summary: The VIM editor
URL: http://www.vim.org/
@ -502,6 +502,7 @@ Patch433: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.433
Patch434: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.434
Patch435: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.435
Patch436: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.436
Patch437: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.437
Patch3000: vim-7.0-syntax.patch
Patch3002: vim-7.1-nowarnings.patch
@ -1076,6 +1077,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch434 -p0
%patch435 -p0
%patch436 -p0
%patch437 -p0
# install spell files
@ -1540,6 +1542,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/*/apps/*
%changelog
* Sat May 22 2010 Karsten Hopp <karsten@redhat.com> 7.2.437-1
- patchlevel 437
* Sun May 16 2010 Karsten Hopp <karsten@redhat.com> 7.2.436-1
- patchlevel 436