- patchlevel 148

2014-01-29 17:03:24 +01:00 · 2014-01-29 17:03:24 +01:00 · 9d34835ba9
commit 9d34835ba9
parent 3be08bdd4d
1 changed files with 83 additions and 0 deletions
--- a/7.4.148
+++ b/7.4.148
@ -0,0 +1,83 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.4.148
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.4.148
+Problem:    Cannot build with Cygwin and X11.
+Solution:   Include Xwindows.h instead of windows.h. (Lech Lorens)
+Files:	    src/mbyte.c
+
+
+*** ../vim-7.4.147/src/mbyte.c	2013-11-12 04:43:57.000000000 +0100
+--- src/mbyte.c	2014-01-14 13:21:36.000000000 +0100
+***************
+*** 83,92 ****
+  # ifndef WIN32_LEAN_AND_MEAN
+  #  define WIN32_LEAN_AND_MEAN
+  # endif
+! # include <windows.h>
+  # ifdef WIN32
+  #  undef WIN32	    /* Some windows.h define WIN32, we don't want that here. */
+  # endif
+  #endif
+  
+  #if (defined(WIN3264) || defined(WIN32UNIX)) && !defined(__MINGW32__)
+--- 83,100 ----
+  # ifndef WIN32_LEAN_AND_MEAN
+  #  define WIN32_LEAN_AND_MEAN
+  # endif
+! # if defined(FEAT_GUI) || defined(FEAT_XCLIPBOARD)
+! #  include <X11/Xwindows.h>
+! #  define WINBYTE wBYTE
+! # else
+! #  include <windows.h>
+! #  define WINBYTE BYTE
+! # endif
+  # ifdef WIN32
+  #  undef WIN32	    /* Some windows.h define WIN32, we don't want that here. */
+  # endif
+ #else
+ # define WINBYTE BYTE
+  #endif
+  
+  #if (defined(WIN3264) || defined(WIN32UNIX)) && !defined(__MINGW32__)
+***************
+*** 698,704 ****
+  	    /* enc_dbcs is set by setting 'fileencoding'.  It becomes a Windows
+  	     * CodePage identifier, which we can pass directly in to Windows
+  	     * API */
+! 	    n = IsDBCSLeadByteEx(enc_dbcs, (BYTE)i) ? 2 : 1;
+  #else
+  # if defined(MACOS) || defined(__amigaos4__)
+  	    /*
+--- 706,712 ----
+  	    /* enc_dbcs is set by setting 'fileencoding'.  It becomes a Windows
+  	     * CodePage identifier, which we can pass directly in to Windows
+  	     * API */
+! 	    n = IsDBCSLeadByteEx(enc_dbcs, (WINBYTE)i) ? 2 : 1;
+  #else
+  # if defined(MACOS) || defined(__amigaos4__)
+  	    /*
+*** ../vim-7.4.147/src/version.c	2014-01-14 13:18:53.000000000 +0100
+--- src/version.c	2014-01-14 13:24:17.000000000 +0100
+***************
+*** 740,741 ****
+--- 740,743 ----
+  {   /* Add new patch number below this line */
+ /**/
+     148,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+154. You fondle your mouse.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///