vim/patches/vim-7.3.219.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.219
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.219
  11 Problem:    Can't compile with GTK on Mac.
  12 Solution:   Add some #ifdef trickery. (Ben Schmidt)
  13 Files:      src/os_mac_conv.c, src/os_macosx.m, src/vim.h
  14
  15
  16 *** ../mercurial/vim73/src/os_mac_conv.c        2010-08-16 21:23:30.000000000 +0200
  17 --- src/os_mac_conv.c   2011-06-13 01:55:17.000000000 +0200
  18 ***************
  19 *** 14,19 ****
  20 --- 14,21 ----
  21    */
  22
  23   #define NO_X11_INCLUDES
  24 + #define BalloonEval int   /* used in header files */
  25 +
  26   #include "vim.h"
  27   #ifndef FEAT_GUI_MAC
  28   # include <CoreServices/CoreServices.h>
  29 *** ../mercurial/vim73/src/os_macosx.m  2010-10-10 17:08:28.000000000 +0200
  30 --- src/os_macosx.m     2011-06-13 01:58:47.000000000 +0200
  31 ***************
  32 *** 18,23 ****
  33 --- 18,24 ----
  34   /* Avoid a conflict for the definition of Boolean between Mac header files and
  35    * X11 header files. */
  36   #define NO_X11_INCLUDES
  37 + #define BalloonEval int   /* used in header files */
  38
  39   #include "vim.h"
  40   #import <Cocoa/Cocoa.h>
  41 ***************
  42 *** 27,35 ****
  43    * Clipboard support for the console.
  44    * Don't include this when building the GUI version, the functions in
  45    * gui_mac.c are used then.  TODO: remove those instead?
  46 !  * But for MacVim we need these ones.
  47    */
  48 ! #if defined(FEAT_CLIPBOARD) && (!defined(FEAT_GUI) || defined(FEAT_GUI_MACVIM))
  49
  50   /* Used to identify clipboard data copied from Vim. */
  51
  52 --- 28,36 ----
  53    * Clipboard support for the console.
  54    * Don't include this when building the GUI version, the functions in
  55    * gui_mac.c are used then.  TODO: remove those instead?
  56 !  * But for MacVim we do need these ones.
  57    */
  58 ! #if defined(FEAT_CLIPBOARD) && (!defined(FEAT_GUI_ENABLED) || defined(FEAT_GUI_MACVIM))
  59
  60   /* Used to identify clipboard data copied from Vim. */
  61
  62 *** ../mercurial/vim73/src/vim.h        2011-05-19 18:26:34.000000000 +0200
  63 --- src/vim.h   2011-06-13 01:57:17.000000000 +0200
  64 ***************
  65 *** 121,126 ****
  66 --- 121,127 ----
  67       || defined(FEAT_GUI_W32) \
  68       || defined(FEAT_GUI_W16) \
  69       || defined(FEAT_GUI_PHOTON)
  70 + # define FEAT_GUI_ENABLED  /* also defined with NO_X11_INCLUDES */
  71   # if !defined(FEAT_GUI) && !defined(NO_X11_INCLUDES)
  72   #  define FEAT_GUI
  73   # endif
  74 *** ../vim-7.3.218/src/version.c        2011-06-13 01:32:42.000000000 +0200
  75 --- src/version.c       2011-06-13 02:03:02.000000000 +0200
  76 ***************
  77 *** 711,712 ****
  78 --- 711,714 ----
  79   {   /* Add new patch number below this line */
  80 + /**/
  81 +     219,
  82   /**/
  83
  84 --
  85 If Microsoft would build a car...
  86 ... the oil, water temperature, and alternator warning lights would
  87 all be replaced by a single "General Protection Fault" warning light.
  88
  89  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  90 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  91 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  92  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///