r355 - in trunk/vim: debian upstream/patches

[Norbert Tretkowski]

Author: nobse
Date: 2005-10-14 20:38:40 +0000 (Fri, 14 Oct 2005)
New Revision: 355

Added:
   trunk/vim/upstream/patches/6.4b.004
Modified:
   trunk/vim/debian/README
   trunk/vim/debian/changelog
Log:
New upstream patch


Modified: trunk/vim/debian/README
===================================================================
--- trunk/vim/debian/README	2005-10-14 18:45:22 UTC (rev 354)
+++ trunk/vim/debian/README	2005-10-14 20:38:40 UTC (rev 355)
@@ -28,3 +28,4 @@
   1558  6.4b.001  :version reported version 6.4a instead of 6.4b
   1951  6.4b.002  cursor in wrong col: paste after line in Insert mode
   2729  6.4b.003  (after 6.4b.002) still wrong when 'enc' is "cp936"
+  1630  6.4b.004  "viB" also selected '}' when it's after an empty line

Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-10-14 18:45:22 UTC (rev 354)
+++ trunk/vim/debian/changelog	2005-10-14 20:38:40 UTC (rev 355)
@@ -1,3 +1,10 @@
+vim (1:6.3+6.4b-004+1) UNRELEASED; urgency=low
+
+  [ Debian VIM Maintainers ]
+  * New upstream patch (004), see README.gz for details.
+
+ -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>  Fri, 14 Oct 2005 22:37:34 +0200
+
 vim (1:6.3+6.4b-003+1) experimental; urgency=low
 
   [ Debian VIM Maintainers ]

Added: trunk/vim/upstream/patches/6.4b.004
===================================================================
--- trunk/vim/upstream/patches/6.4b.004	2005-10-14 18:45:22 UTC (rev 354)
+++ trunk/vim/upstream/patches/6.4b.004	2005-10-14 20:38:40 UTC (rev 355)
@@ -0,0 +1,54 @@
+To: vim-dev at vim.org
+Subject: Patch 6.4b.004
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.4b.004
+Problem:    Selecting a {} block with "viB" includes the '}' when there is an
+	    empty line before it.
+Solution:   Don't advance the cursor to include a line break when it's already
+	    at the line break.
+Files:	    src/search.c
+
+
+*** ../vim-6.4b.003/src/search.c	Thu Oct  6 20:41:27 2005
+--- src/search.c	Fri Oct 14 20:22:17 2005
+***************
+*** 3408,3414 ****
+      {
+  	if (*p_sel == 'e')
+  	    ++curwin->w_cursor.col;
+! 	if (sol)
+  	    inc(&curwin->w_cursor);	/* include the line break */
+  	VIsual = start_pos;
+  	VIsual_mode = 'v';
+--- 3408,3414 ----
+      {
+  	if (*p_sel == 'e')
+  	    ++curwin->w_cursor.col;
+! 	if (sol && gchar_cursor() != NUL)
+  	    inc(&curwin->w_cursor);	/* include the line break */
+  	VIsual = start_pos;
+  	VIsual_mode = 'v';
+*** ../vim-6.4b.003/src/version.c	Fri Oct 14 17:44:45 2005
+--- src/version.c	Fri Oct 14 22:34:30 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     4,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+13. Go to a poetry recital and ask why the poems don't rhyme.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///