r363 - in trunk/vim: debian upstream/patches

[Norbert Tretkowski]

Author: nobse
Date: 2005-10-17 09:24:02 +0000 (Mon, 17 Oct 2005)
New Revision: 363

Added:
   trunk/vim/upstream/patches/6.4.001
Modified:
   trunk/vim/debian/README
   trunk/vim/debian/changelog
Log:
New upstream patch

Modified: trunk/vim/debian/README
===================================================================
--- trunk/vim/debian/README	2005-10-16 16:30:41 UTC (rev 362)
+++ trunk/vim/debian/README	2005-10-17 09:24:02 UTC (rev 363)
@@ -1,4 +1,4 @@
-Patches for Vim - Vi IMproved 6.4b
+Patches for Vim - Vi IMproved 6.4
 
 The files in this directory contain source code changes to fix
 problems in released versions of Vim.  Each file also contains an
@@ -14,18 +14,15 @@
 and "runtime" directories are located.
 Depending on the version of "patch" that you use, you may have add
 an argument to make it patch the right file:
-        patch -p < 6.4b.001
-        patch -p0 < 6.4b.001
+        patch -p < 6.4.001
+        patch -p0 < 6.4.001
 
 After applying a patch, you need to compile Vim.  There are no
 patches for binaries.
 
 Checksums for the patch files can be found in the file MD5.
 
-Individual patches for Vim 6.4b:
+Individual patches for Vim 6.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
-  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
+  SIZE  NAME     FIXES
+  1705  6.4.001  (extra) Win32: can't compile the global IME code

Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-10-16 16:30:41 UTC (rev 362)
+++ trunk/vim/debian/changelog	2005-10-17 09:24:02 UTC (rev 363)
@@ -1,18 +1,25 @@
-vim (1:6.4-000+2) UNRELEASED; urgency=low
+vim (1:6.4-001+1) UNRELEASED; urgency=low
 
+  [ Debian VIM Maintainers ]
+  * New upstream patch (001), see README.gz for details.
+
   [ Stefano Zacchiroli ]
   * Added "sources" debian/rules target which downloads upstream
     tarballs.
   * Added patch 303_option.c.diff, which fixes 'system()' behaviour
     when $SHELL is empty. (closes: #219386)
 
- -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>  Sun, 16 Oct 2005 18:05:07 +0200
+ -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>  Mon, 17 Oct 2005 11:23:04 +0200
 
 vim (1:6.4-000+1) unstable; urgency=low
 
   [ Debian VIM Maintainers ]
   * New major upstream release (6.4).
 
+  [ Norbert Tretkowski ]
+  * Removed patches merged upstream:
+    + 118_ocaml.vim.diff
+
  -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>  Sat, 15 Oct 2005 18:40:22 +0200
 
 vim (1:6.3+6.4b-003+1) experimental; urgency=low

Added: trunk/vim/upstream/patches/6.4.001
===================================================================
--- trunk/vim/upstream/patches/6.4.001	2005-10-16 16:30:41 UTC (rev 362)
+++ trunk/vim/upstream/patches/6.4.001	2005-10-17 09:24:02 UTC (rev 363)
@@ -0,0 +1,57 @@
+To: vim-dev at vim.org
+Subject: Patch 6.4.001 (extra)
+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
+------------
+
+Note: This only changes the code for Global IME, none of the 6.4
+executables are affected.
+
+
+Patch 6.4.001 (extra)
+Problem:    Win32: Can't compile the Global IME code.
+Solution:   Change "hwnd" to "hWnd". (Yongwei)
+Files:	    src/glbl_ime.cpp
+
+
+*** ../vim-6.4.000/src/glbl_ime.cpp	Tue May 11 22:29:41 2004
+--- src/glbl_ime.cpp	Mon Oct 17 11:03:43 2005
+***************
+*** 136,142 ****
+      {
+  #if defined(WIN3264) && defined(FEAT_MBYTE)
+  	if (wide_WindowProc)
+! 	    lResult = DefWindowProcW(hwnd, Msg, wParam, lParam);
+  	else
+  #endif
+  	    lResult = DefWindowProc(hWnd, Msg, wParam, lParam);
+--- 136,142 ----
+      {
+  #if defined(WIN3264) && defined(FEAT_MBYTE)
+  	if (wide_WindowProc)
+! 	    lResult = DefWindowProcW(hWnd, Msg, wParam, lParam);
+  	else
+  #endif
+  	    lResult = DefWindowProc(hWnd, Msg, wParam, lParam);
+*** ../vim-6.4.000/src/version.c	Sat Oct 15 13:23:40 2005
+--- src/version.c	Mon Oct 17 11:08:25 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     1,
+  /**/
+
+-- 
+Well, you come from nothing, you go back to nothing...  What have you
+lost?  Nothing!
+				-- Monty Python: The life of Brian
+
+ /// 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   ///