r220 - in trunk/vim: debian upstream/patches
Norbert Tretkowski
nobse@costa.debian.org
Sun, 22 May 2005 13:00:32 +0000
Author: nobse
Date: 2005-05-22 13:00:31 +0000 (Sun, 22 May 2005)
New Revision: 220
Added:
trunk/vim/upstream/patches/6.3.073
trunk/vim/upstream/patches/6.3.074
Modified:
trunk/vim/debian/README
trunk/vim/debian/changelog
Log:
new upstream patches
Modified: trunk/vim/debian/README
===================================================================
--- trunk/vim/debian/README 2005-05-21 15:07:52 UTC (rev 219)
+++ trunk/vim/debian/README 2005-05-22 13:00:31 UTC (rev 220)
@@ -97,3 +97,5 @@
1928 6.3.070 crash when 'number' set and with a vertical split
1722 6.3.071 CTRL-X message sticks after error for completion
2083 6.3.072 crash for substitute message when using UTF-8 and Chinese
+ 2017 6.3.073 Win32 GUI: display errors when scrolling up/down
+ 2365 6.3.074 with 'insertmode' CTRL-V after Select mode doesn't work
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2005-05-21 15:07:52 UTC (rev 219)
+++ trunk/vim/debian/changelog 2005-05-22 13:00:31 UTC (rev 220)
@@ -1,3 +1,9 @@
+vim (1:6.3-074+1) UNRELEASED; urgency=low
+
+ * New upstream patches (073 and 074), see README.gz for details.
+
+ -- Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org> Sun, 22 May 2005 14:59:31 +0200
+
vim (1:6.3-072+1) unstable; urgency=high
* New upstream patch (072), see README.gz for details.
Added: trunk/vim/upstream/patches/6.3.073
===================================================================
--- trunk/vim/upstream/patches/6.3.073 2005-05-21 15:07:52 UTC (rev 219)
+++ trunk/vim/upstream/patches/6.3.073 2005-05-22 13:00:31 UTC (rev 220)
@@ -0,0 +1,57 @@
+To: vim-dev@vim.org
+Subject: Patch 6.3.073
+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 6.3.073
+Problem: Win32 GUI: When the Vim window is partly above or below the
+ screen, scrolling causes display errors when the taskbar is not on
+ that side.
+Solution: Use the SW_INVALIDATE flag when the Vim window is partly below or
+ above the screen.
+Files: src/gui_w48.c
+
+
+*** ../vim-6.3.016/src/gui_w48.c Thu Dec 16 14:26:44 2004
+--- src/gui_w48.c Sun May 22 12:06:07 2005
+***************
+*** 2504,2509 ****
+--- 2504,2517 ----
+ RECT rcVim, rcOther, rcDest;
+
+ GetWindowRect(s_hwnd, &rcVim);
++
++ /* Check if the window is partly above or below the screen. We don't care
++ * about partly left or right of the screen, it is not relevant when
++ * scrolling up or down. */
++ if (rcVim.top < 0 || rcVim.bottom > GetSystemMetrics(SM_CYFULLSCREEN))
++ return SW_INVALIDATE;
++
++ /* Check if there is an window (partly) on top of us. */
+ for (hwnd = s_hwnd; (hwnd = GetWindow(hwnd, GW_HWNDPREV)) != (HWND)0; )
+ if (IsWindowVisible(hwnd))
+ {
+*** ../vim-6.3.016/src/version.c Fri May 20 13:18:31 2005
+--- src/version.c Sun May 22 12:08:44 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+ { /* Add new patch number below this line */
++ /**/
++ 73,
+ /**/
+
+--
+TERRY GILLIAM PLAYED: PATSY (ARTHUR'S TRUSTY STEED), THE GREEN KNIGHT
+ SOOTHSAYER, BRIDGEKEEPER, SIR GAWAIN (THE FIRST TO BE
+ KILLED BY THE RABBIT)
+ "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@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 ///
Added: trunk/vim/upstream/patches/6.3.074
===================================================================
--- trunk/vim/upstream/patches/6.3.074 2005-05-21 15:07:52 UTC (rev 219)
+++ trunk/vim/upstream/patches/6.3.074 2005-05-22 13:00:31 UTC (rev 220)
@@ -0,0 +1,71 @@
+To: vim-dev@vim.org
+Subject: Patch 6.3.074
+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 6.3.074
+Problem: When mswin.vim is used and 'insertmode' is set, typing text in
+ Select mode and then using CTRL-V results in <SNR>99_Pastegi.
+ (Georg Dahn)
+Solution: When restart_edit is set use "d" instead of "c" to remove the
+ selected text to avoid calling edit() twice.
+Files: src/normal.c
+
+
+*** ../vim-6.3.073/src/normal.c Thu Nov 18 10:47:49 2004
+--- src/normal.c Fri May 20 13:14:14 2005
+***************
+*** 643,654 ****
+ buf[0] = c;
+ buf[1] = NUL;
+ # endif
+! /* Fake a "c"hange command.
+ * Insert the typed character in the typeahead buffer, so that it will
+ * be mapped in Insert mode. Required for ":lmap" to work. May cause
+ * mapping a character from ":vnoremap"... */
+ (void)ins_typebuf(buf, REMAP_YES, 0, !KeyTyped, FALSE);
+! c = 'c';
+ }
+ #endif
+
+--- 643,659 ----
+ buf[0] = c;
+ buf[1] = NUL;
+ # endif
+! /* Fake a "c"hange command. When "restart_edit" is set (e.g., because
+! * 'insertmode' is set) fake a "d"elete command, Insert mode will
+! * restart automatically.
+ * Insert the typed character in the typeahead buffer, so that it will
+ * be mapped in Insert mode. Required for ":lmap" to work. May cause
+ * mapping a character from ":vnoremap"... */
+ (void)ins_typebuf(buf, REMAP_YES, 0, !KeyTyped, FALSE);
+! if (restart_edit != 0)
+! c = 'd';
+! else
+! c = 'c';
+ }
+ #endif
+
+*** ../vim-6.3.073/src/version.c Sun May 22 12:11:10 2005
+--- src/version.c Sun May 22 12:16:16 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+ { /* Add new patch number below this line */
++ /**/
++ 74,
+ /**/
+
+--
+NEIL INNES PLAYED: THE FIRST SELF-DESTRUCTIVE MONK, ROBIN'S LEAST FAVORITE
+ MINSTREL, THE PAGE CRUSHED BY A RABBIT, THE OWNER OF A DUCK
+ "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@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 ///