- patchlevel 351

7.2.351

@@ -0,0 +1,78 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.351 (after 7.2.347)
+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.351 (after 7.2.347)
+Problem:    Can't build with some compilers.
+Solution:   Move the #ifdef outside of a macro.  Cleanup the code.
+Files:	    src/getchar.c
+
+
+*** ../vim-7.2.350/src/getchar.c	2010-01-27 17:31:38.000000000 +0100
+--- src/getchar.c	2010-01-28 22:42:22.000000000 +0100
+***************
+*** 2492,2508 ****
+  			    i = FAIL;
+  			else
+  			{
+! 			    i = ins_typebuf(s,
+! 				    save_m_noremap != REMAP_YES
+! 					    ? save_m_noremap
+! 					    : STRNCMP(s,
+  #ifdef FEAT_EVAL
+! 					   save_m_keys != NULL ? save_m_keys :
+  #endif
+! 						      mp->m_keys,
+! 							  (size_t)keylen) != 0
+! 						     ? REMAP_YES : REMAP_SKIP,
+! 				0, TRUE, cmd_silent || save_m_silent);
+  #ifdef FEAT_EVAL
+  			    if (save_m_expr)
+  				vim_free(s);
+--- 2492,2515 ----
+  			    i = FAIL;
+  			else
+  			{
+! 			    int noremap;
+! 
+! 			    if (save_m_noremap != REMAP_YES)
+! 				noremap = save_m_noremap;
+! 			    else if (
+  #ifdef FEAT_EVAL
+! 				STRNCMP(s, save_m_keys != NULL
+! 						   ? save_m_keys : mp->m_keys,
+! 							 (size_t)keylen)
+! #else
+! 				STRNCMP(s, mp->m_keys, (size_t)keylen)
+  #endif
+! 				   != 0)
+! 				noremap = REMAP_YES;
+! 			    else
+! 				noremap = REMAP_SKIP;
+! 			    i = ins_typebuf(s, noremap,
+! 					0, TRUE, cmd_silent || save_m_silent);
+  #ifdef FEAT_EVAL
+  			    if (save_m_expr)
+  				vim_free(s);
+*** ../vim-7.2.350/src/version.c	2010-01-27 21:04:58.000000000 +0100
+--- src/version.c	2010-01-28 22:50:53.000000000 +0100
+***************
+*** 683,684 ****
+--- 683,686 ----
+  {   /* Add new patch number below this line */
++ /**/
++     351,
+  /**/
+
+-- 
+"Hit any key to continue" it said, but nothing happened after F sharp.
+
+ /// 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

@@ -381,3 +381,4 @@ Individual patches for Vim 7.2:
   7230  7.2.348  (after 7.2.330) Unicode double width table is outdated
   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

vim-update.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+cd $HOME/src/fedora/rpms/vim/devel/
 LANG=C
 SPEC=vim.spec
 
@@ -33,10 +34,10 @@ while true; do
         sed -i -e "/patch$((PL-1)) -p0/a%patch$PL -p0" $SPEC
     fi
 done
-sed -i -e "/Release: /cRelease: 1%{dist}" $SPEC
+sed -i -e "/Release: /cRelease: 1%{?dist}" $SPEC
 sed -i -e "s/define patchlevel $ORIGPL/define patchlevel $PL/" $SPEC
 sed -i -e "/\%changelog/a$CHLOG.$PL-1\n- patchlevel $PL\n" $SPEC
 wget ftp://ftp.vim.org/pub/vim/patches/$MAJORVERSION/README -O README.patches
 cvs ci -m "- patchlevel $PL" 
 make tag
-make build
+make SECONDARY_CONFIG="-c /etc/koji.conf" build

vim.spec

@@ -18,7 +18,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim72%{?beta}
-%define patchlevel 350
+%define patchlevel 351
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -416,6 +416,7 @@ Patch347: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.347
 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
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -904,6 +905,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch348 -p0
 %patch349 -p0
 %patch350 -p0
+%patch351 -p0
 
 
 # install spell files
@@ -1368,6 +1370,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Fri Jan 29 2010 Karsten Hopp <karsten@redhat.com> 7.2.351-1
+- patchlevel 351
+
 * Thu Jan 28 2010 Karsten Hopp <karsten@redhat.com> 7.2.350-1
 - patchlevel 350