- patchlevel 201

7.0.201

@@ -0,0 +1,81 @@
+To: vim-dev@vim.org
+Subject: patch 7.0.201
+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.0.201
+Problem:    Message for ":diffput" about buffer not being in diff mode may be
+            wrong.
+Solution:   Check for buffer in diff mode but not modifiable.
+Files:      src/diff.c
+
+
+*** ../vim-7.0.200/src/diff.c	Tue Feb 20 03:52:04 2007
+--- src/diff.c	Fri Feb 16 01:18:41 2007
+***************
+*** 2014,2019 ****
+--- 2014,2020 ----
+      int		start_skip, end_skip;
+      int		new_count;
+      int		buf_empty;
++     int		found_not_ma = FALSE;
+  
+      /* Find the current buffer in the list of diff buffers. */
+      idx_cur = diff_buf_idx(curbuf);
+***************
+*** 2028,2040 ****
+  	/* No argument: Find the other buffer in the list of diff buffers. */
+  	for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
+  	    if (curtab->tp_diffbuf[idx_other] != curbuf
+! 		    && curtab->tp_diffbuf[idx_other] != NULL
+! 		    && (eap->cmdidx != CMD_diffput
+! 					       || curtab->tp_diffbuf[idx_other]->b_p_ma))
+! 		break;
+  	if (idx_other == DB_COUNT)
+  	{
+! 	    EMSG(_("E100: No other buffer in diff mode"));
+  	    return;
+  	}
+  
+--- 2029,2047 ----
+  	/* No argument: Find the other buffer in the list of diff buffers. */
+  	for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
+  	    if (curtab->tp_diffbuf[idx_other] != curbuf
+! 		    && curtab->tp_diffbuf[idx_other] != NULL)
+! 	    {
+! 		if (eap->cmdidx != CMD_diffput
+! 				     || curtab->tp_diffbuf[idx_other]->b_p_ma)
+! 		    break;
+! 		found_not_ma = TRUE;
+! 	    }
+  	if (idx_other == DB_COUNT)
+  	{
+! 	    if (found_not_ma)
+! 		EMSG(_("E793: No other buffer in diff mode is modifiable"));
+! 	    else
+! 		EMSG(_("E100: No other buffer in diff mode"));
+  	    return;
+  	}
+  
+*** ../vim-7.0.200/src/version.c	Tue Feb 20 03:52:04 2007
+--- src/version.c	Tue Feb 20 04:46:00 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     201,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+159. You get excited whenever discussing your hard drive.
+
+ /// 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

@@ -25,6 +25,7 @@ Checksums for the patch files can be found in the file MD5.
 Collection of patches for Vim 7.0:
   SIZE  NAME                  INCLUDES
  98331  7.0.001-100.gz	      patches 7.0.001 to 7.0.100, gzip'ed
+ 79463  7.0.101-200.gz        patches 7.0.101 to 7.0.200, gzip'ed
 
 
 Individual patches for Vim 7.0:
@@ -225,3 +226,9 @@ Individual patches for Vim 7.0:
   1599  7.0.193  crash when using --remote with arg matching 'wildignore'
   2701  7.0.194  ml_get errors may be given in a recursive loop
   2677  7.0.195  endless loop for conversion error when auto-writing
+  2751  7.0.196  mouse pointer position wrong after ":vert ball"
+  1717  7.0.197  (extra) Win32: can't compile with EXITFREE
+  7454  7.0.198  (extra) Win32: compiler warnings, don't generate gvim.exe.mnf
+  1969  7.0.199  cursor in wrong col when completing+formatting multi-byte
+  2792  7.0.200  memory leaks when out of memory
+  2511  7.0.201  error message from ":diffput" may be wrong

vim.spec

@@ -15,13 +15,13 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim70%{?beta}
-%define patchlevel 195
+%define patchlevel 201
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -248,6 +248,12 @@ Patch192: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.192
 Patch193: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.193
 Patch194: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.194
 Patch195: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.195
+Patch196: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.196
+#Patch197: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.197
+#Patch198: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.198
+Patch199: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.199
+Patch200: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.200
+Patch201: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.201
 
 Patch3000: vim-7.0-syntax.patch
 #Patch3001: vim-6.2-rh1.patch
@@ -607,6 +613,13 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch193 -p0
 %patch194 -p0
 %patch195 -p0
+%patch196 -p0
+# Win32:
+#patch197 -p0
+#patch198 -p0
+%patch199 -p0
+%patch200 -p0
+%patch201 -p0
 
 # install spell files
 %if %{withvimspell}