Karsten Hopp 67a281
To: vim-dev@vim.org
Karsten Hopp 67a281
Subject: Patch 7.2.437
Karsten Hopp 67a281
Fcc: outbox
Karsten Hopp 67a281
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 67a281
Mime-Version: 1.0
Karsten Hopp 67a281
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 67a281
Content-Transfer-Encoding: 8bit
Karsten Hopp 67a281
------------
Karsten Hopp 67a281
Karsten Hopp 67a281
Patch 7.2.437 (after 7.2.407)
Karsten Hopp 67a281
Problem:    When "\\\n" appears in the expression result the \n doesn't result
Karsten Hopp 67a281
	    in a line break. (Andy Wokula)
Karsten Hopp 67a281
Solution:   Also replace a \n after a backslash into \r.
Karsten Hopp 67a281
Files:	    src/regexp.c
Karsten Hopp 67a281
Karsten Hopp 67a281
Karsten Hopp 67a281
*** ../vim-7.2.436/src/regexp.c	2010-03-23 16:27:15.000000000 +0100
Karsten Hopp 67a281
--- src/regexp.c	2010-05-21 13:06:00.000000000 +0200
Karsten Hopp 67a281
***************
Karsten Hopp 67a281
*** 6974,6979 ****
Karsten Hopp 67a281
--- 6974,6986 ----
Karsten Hopp 67a281
  		    else if (*s == '\\' && s[1] != NUL)
Karsten Hopp 67a281
  		    {
Karsten Hopp 67a281
  			++s;
Karsten Hopp 67a281
+ 			/* Change NL to CR here too, so that this works:
Karsten Hopp 67a281
+ 			 * :s/abc\\\ndef/\="aaa\\\nbbb"/  on text:
Karsten Hopp 67a281
+ 			 *   abc\
Karsten Hopp 67a281
+ 			 *   def
Karsten Hopp 67a281
+ 			 */
Karsten Hopp 67a281
+ 			if (*s == NL)
Karsten Hopp 67a281
+ 			    *s = CAR;
Karsten Hopp 67a281
  			had_backslash = TRUE;
Karsten Hopp 67a281
  		    }
Karsten Hopp 67a281
  		}
Karsten Hopp 67a281
*** ../vim-7.2.436/src/version.c	2010-05-16 13:56:01.000000000 +0200
Karsten Hopp 67a281
--- src/version.c	2010-05-21 13:07:50.000000000 +0200
Karsten Hopp 67a281
***************
Karsten Hopp 67a281
*** 683,684 ****
Karsten Hopp 67a281
--- 683,686 ----
Karsten Hopp 67a281
  {   /* Add new patch number below this line */
Karsten Hopp 67a281
+ /**/
Karsten Hopp 67a281
+     437,
Karsten Hopp 67a281
  /**/
Karsten Hopp 67a281
Karsten Hopp 67a281
-- 
Karsten Hopp 67a281
hundred-and-one symptoms of being an internet addict:
Karsten Hopp 67a281
89. In addition to your e-mail address being on your business
Karsten Hopp 67a281
    cards you even have your own domain.
Karsten Hopp 67a281
Karsten Hopp 67a281
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 67a281
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 67a281
\\\        download, build and distribute -- http://www.A-A-P.org        ///
Karsten Hopp 67a281
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///