r341 - in trunk/vim: debian upstream/patches
Norbert Tretkowski
nobse at costa.debian.org
Wed Oct 12 19:12:31 UTC 2005
Author: nobse
Date: 2005-10-12 19:12:24 +0000 (Wed, 12 Oct 2005)
New Revision: 341
Added:
trunk/vim/upstream/patches/6.4b.002
Modified:
trunk/vim/debian/README
trunk/vim/debian/changelog
Log:
New upstream patch.
Modified: trunk/vim/debian/README
===================================================================
--- trunk/vim/debian/README 2005-10-12 08:34:12 UTC (rev 340)
+++ trunk/vim/debian/README 2005-10-12 19:12:24 UTC (rev 341)
@@ -26,3 +26,4 @@
SIZE NAME FIXES
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
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2005-10-12 08:34:12 UTC (rev 340)
+++ trunk/vim/debian/changelog 2005-10-12 19:12:24 UTC (rev 341)
@@ -1,3 +1,10 @@
+vim (1:6.3+6.4b-002+1) experimental; urgency=low
+
+ [ Debian VIM Maintainers ]
+ * New upstream patch (002), see README.gz for details.
+
+ -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org> Wed, 12 Oct 2005 21:11:22 +0200
+
vim (1:6.3+6.4b-001+1) experimental; urgency=low
[ Debian VIM Maintainers ]
@@ -2,3 +9,3 @@
* New major upstream beta release (6.4b).
- * New upstream patch (6.4b.001), see README.gz for details.
+ * New upstream patch (001), see README.gz for details.
Added: trunk/vim/upstream/patches/6.4b.002
===================================================================
--- trunk/vim/upstream/patches/6.4b.002 2005-10-12 08:34:12 UTC (rev 340)
+++ trunk/vim/upstream/patches/6.4b.002 2005-10-12 19:12:24 UTC (rev 341)
@@ -0,0 +1,68 @@
+To: vim-dev at vim.org
+Subject: Patch 6.4b.002
+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.002
+Problem: In Insert mode, pasting a multi-byte character after the end of
+ the line leaves the cursor just before that character.
+Solution: Make sure "gP" leaves the cursor in the right place when
+ 'virtualedit' is set.
+Files: src/ops.c
+
+
+*** ../vim-6.4b.001/src/ops.c Sat Dec 11 16:11:42 2004
+--- src/ops.c Wed Oct 12 20:51:39 2005
+***************
+*** 3619,3628 ****
+ && curwin->w_cursor.col > 0
+ && !(restart_edit || (State & INSERT)))
+ {
+ --curwin->w_cursor.col;
+ #ifdef FEAT_VIRTUALEDIT
+ if (ve_flags == VE_ALL)
+! ++curwin->w_cursor.coladd;
+ #endif
+ }
+ }
+--- 3619,3635 ----
+ && curwin->w_cursor.col > 0
+ && !(restart_edit || (State & INSERT)))
+ {
++ #ifdef FEAT_VIRTUALEDIT
++ col = curwin->w_cursor.col;
++ #endif
+ --curwin->w_cursor.col;
++ #ifdef FEAT_MBYTE
++ if (has_mbyte)
++ mb_adjust_cursor();
++ #endif
+ #ifdef FEAT_VIRTUALEDIT
+ if (ve_flags == VE_ALL)
+! curwin->w_cursor.coladd = col - curwin->w_cursor.col;
+ #endif
+ }
+ }
+*** ../vim-6.4b.001/src/version.c Tue Oct 11 10:05:39 2005
+--- src/version.c Wed Oct 12 20:52:41 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+ { /* Add new patch number below this line */
++ /**/
++ 2,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+16. You step out of your room and realize that your parents have moved and
+ you don't have a clue when it happened.
+
+ /// 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 ///
More information about the pkg-vim-maintainers
mailing list