[packages/vim.git] / 7.1.046

To: vim-dev@vim.org
Subject: patch 7.1.046
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.046
Problem:    ":s" command removes combining characters. (Ron Aaron)
Solution:   Copy composing characters individually. (Chris Lubinski)
Files:	    src/regexp.c


*** ../vim-7.1.045/src/regexp.c	Thu May 10 19:58:01 2007
--- src/regexp.c	Fri Jul 27 21:17:47 2007
***************
*** 7014,7020 ****
  #ifdef FEAT_MBYTE
  			    if (has_mbyte)
  			    {
! 				int l = mb_ptr2len(s) - 1;
  
  				s += l;
  				len -= l;
--- 7014,7027 ----
  #ifdef FEAT_MBYTE
  			    if (has_mbyte)
  			    {
! 				int l;
! 
! 				/* Copy composing characters separately, one
! 				 * at a time. */
! 				if (enc_utf8)
! 				    l = utf_ptr2len(s) - 1;
! 				else
! 				    l = mb_ptr2len(s) - 1;
  
  				s += l;
  				len -= l;
*** ../vim-7.1.045/src/version.c	Mon Jul 30 21:59:50 2007
--- src/version.c	Mon Jul 30 22:30:02 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     46,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
57. You begin to wonder how on earth your service provider is allowed to call
    200 hours per month "unlimited."

 /// 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    ///
Commit	Line	Data
6577e359	1	To: vim-dev@vim.org
	2	Subject: patch 7.1.046
	3	Fcc: outbox
	4	From: Bram Moolenaar <Bram@moolenaar.net>
	5	Mime-Version: 1.0
	6	Content-Type: text/plain; charset=ISO-8859-1
	7	Content-Transfer-Encoding: 8bit
	8	------------
	9
	10	Patch 7.1.046
	11	Problem: ":s" command removes combining characters. (Ron Aaron)
	12	Solution: Copy composing characters individually. (Chris Lubinski)
	13	Files: src/regexp.c
	14
	15
	16	*** ../vim-7.1.045/src/regexp.c Thu May 10 19:58:01 2007
	17	--- src/regexp.c Fri Jul 27 21:17:47 2007
	18	***************
	19	* 7014,7020 **
	20	#ifdef FEAT_MBYTE
	21	if (has_mbyte)
	22	{
	23	! int l = mb_ptr2len(s) - 1;
	24
	25	s += l;
	26	len -= l;
	27	--- 7014,7027 ----
	28	#ifdef FEAT_MBYTE
	29	if (has_mbyte)
	30	{
	31	! int l;
	32	!
	33	! /* Copy composing characters separately, one
	34	! * at a time. */
	35	! if (enc_utf8)
	36	! l = utf_ptr2len(s) - 1;
	37	! else
	38	! l = mb_ptr2len(s) - 1;
	39
	40	s += l;
	41	len -= l;
	42	*** ../vim-7.1.045/src/version.c Mon Jul 30 21:59:50 2007
	43	--- src/version.c Mon Jul 30 22:30:02 2007
	44	***************
	45	* 668,669 **
	46	--- 668,671 ----
	47	{ /* Add new patch number below this line */
	48	+ /**/
	49	+ 46,
	50	/**/
	51
	52	--
	53	hundred-and-one symptoms of being an internet addict:
	54	57. You begin to wonder how on earth your service provider is allowed to call
	55	200 hours per month "unlimited."
	56
	57	/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
	58	/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
	59	\\\ download, build and distribute -- http://www.A-A-P.org ///
	60	\\\ help me help AIDS victims -- http://ICCF-Holland.org ///