- patchlevel 354

7.2.354

@@ -0,0 +1,78 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.354
+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.354
+Problem:    Japanese single-width double-byte characters not handled correctly.
+Solution:   Put 0x8e in ScreenLines[] and the second byte in ScreenLines2[].
+	    (partly by Kikuchan)
+Files:	    src/screen.c
+
+
+*** ../vim-7.2.353/src/screen.c	2010-01-19 17:40:39.000000000 +0100
+--- src/screen.c	2010-02-03 15:47:19.000000000 +0100
+***************
+*** 2335,2347 ****
+  		if (cells > 1)
+  		    ScreenLines[idx + 1] = 0;
+  	    }
+! 	    else if (cells > 1)	    /* double-byte character */
+! 	    {
+! 		if (enc_dbcs == DBCS_JPNU && *p == 0x8e)
+! 		    ScreenLines2[idx] = p[1];
+! 		else
+! 		    ScreenLines[idx + 1] = p[1];
+! 	    }
+  	    col += cells;
+  	    idx += cells;
+  	    p += c_len;
+--- 2335,2346 ----
+  		if (cells > 1)
+  		    ScreenLines[idx + 1] = 0;
+  	    }
+! 	    else if (enc_dbcs == DBCS_JPNU && *p == 0x8e)
+! 		/* double-byte single width character */
+! 		ScreenLines2[idx] = p[1];
+! 	    else if (cells > 1)
+! 		/* double-width character */
+! 		ScreenLines[idx + 1] = p[1];
+  	    col += cells;
+  	    idx += cells;
+  	    p += c_len;
+***************
+*** 4631,4637 ****
+--- 4630,4640 ----
+  	    ScreenLines[off] = c;
+  #ifdef FEAT_MBYTE
+  	    if (enc_dbcs == DBCS_JPNU)
++ 	    {
++ 		if ((mb_c & 0xff00) == 0x8e00)
++ 		    ScreenLines[off] = 0x8e;
+  		ScreenLines2[off] = mb_c & 0xff;
++ 	    }
+  	    else if (enc_utf8)
+  	    {
+  		if (mb_utf8)
+*** ../vim-7.2.353/src/version.c	2010-02-03 15:14:15.000000000 +0100
+--- src/version.c	2010-02-03 15:43:43.000000000 +0100
+***************
+*** 683,684 ****
+--- 683,686 ----
+  {   /* Add new patch number below this line */
++ /**/
++     354,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+189. You put your e-mail address in the upper left-hand corner of envelopes.
+
+ /// 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    ///

README.patches

@@ -382,3 +382,6 @@ Individual patches for Vim 7.2:
   1714  7.2.349  CTRL-W gf puts the new tab in the wrong place
   2766  7.2.350  Win32: When changing font window may jump to another screen
   2195  7.2.351  (after 7.2.347) compilation fails with some compilers
+  1825  7.2.352  Win64: Vim doesn't work when cross-compiled with MingW libs
+  4764  7.2.353  no command line completion for ":profile"
+  2270  7.2.354  Japanese single-width double-byte chars not handled correctly

vim.spec

@@ -18,7 +18,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim72%{?beta}
-%define patchlevel 351
+%define patchlevel 354
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -417,6 +417,9 @@ Patch348: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.348
 Patch349: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.349
 Patch350: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.350
 Patch351: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.351
+Patch352: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.352
+Patch353: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.353
+Patch354: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.354
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -906,6 +909,9 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch349 -p0
 %patch350 -p0
 %patch351 -p0
+%patch352 -p0
+%patch353 -p0
+%patch354 -p0
 
 
 # install spell files
@@ -1370,6 +1376,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Feb 03 2010 Karsten Hopp <karsten@redhat.com> 7.2.354-1
+- patchlevel 354
+
 * Fri Jan 29 2010 Karsten Hopp <karsten@redhat.com> 7.2.351-1
 - patchlevel 351