6.2.035

   1 To: vim-dev@vim.org
   2 Subject: Patch 6.2.035
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=ISO-8859-1
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 6.2.035
  11 Problem:    Mac: Compiler warnings in Python interface.
  12 Solution:   Make a difference between pure Mac and Unix-Mac. (Peter Cucka)
  13 Files:      src/if_python.c
  14
  15
  16 *** ../vim-6.2.034/src/if_python.c      Sat Apr 19 15:21:01 2003
  17 --- src/if_python.c     Fri Jul 25 21:31:46 2003
  18 ***************
  19 *** 41,47 ****
  20   #endif
  21
  22   #include <Python.h>
  23 ! #ifdef MACOS
  24   # include "macglue.h"
  25   # include <CodeFragments.h>
  26   #endif
  27 --- 41,47 ----
  28   #endif
  29
  30   #include <Python.h>
  31 ! #if defined(MACOS) && !defined(MACOS_X_UNIX)
  32   # include "macglue.h"
  33   # include <CodeFragments.h>
  34   #endif
  35 ***************
  36 *** 396,402 ****
  37         }
  38   #endif
  39
  40 ! #ifndef MACOS
  41         Py_Initialize();
  42   #else
  43         PyMac_Initialize();
  44 --- 396,402 ----
  45         }
  46   #endif
  47
  48 ! #if !defined(MACOS) || defined(MACOS_X_UNIX)
  49         Py_Initialize();
  50   #else
  51         PyMac_Initialize();
  52 ***************
  53 *** 437,443 ****
  54       static void
  55   DoPythonCommand(exarg_T *eap, const char *cmd)
  56   {
  57 ! #ifdef MACOS
  58       GrafPtr oldPort;
  59       GetPort (&oldPort);
  60       /* Check if the Python library is available */
  61 --- 437,443 ----
  62       static void
  63   DoPythonCommand(exarg_T *eap, const char *cmd)
  64   {
  65 ! #if defined(MACOS) && !defined(MACOS_X_UNIX)
  66       GrafPtr oldPort;
  67       GetPort (&oldPort);
  68       /* Check if the Python library is available */
  69 ***************
  70 *** 455,461 ****
  71       Python_SaveThread();          /* leave python */
  72       Python_Lock_Vim();                    /* enter vim */
  73       PythonIO_Flush();
  74 ! #ifdef MACOS
  75       SetPort (oldPort);
  76   #endif
  77   }
  78 --- 455,461 ----
  79       Python_SaveThread();          /* leave python */
  80       Python_Lock_Vim();                    /* enter vim */
  81       PythonIO_Flush();
  82 ! #if defined(MACOS) && !defined(MACOS_X_UNIX)
  83       SetPort (oldPort);
  84   #endif
  85   }
  86 *** ../vim-6.2.034/src/version.c        Fri Jul 25 22:25:04 2003
  87 --- src/version.c       Fri Jul 25 22:27:19 2003
  88 ***************
  89 *** 632,633 ****
  90 --- 632,635 ----
  91   {   /* Add new patch number below this line */
  92 + /**/
  93 +     35,
  94   /**/
  95
  96 --
  97 If you don't get everything you want, think of
  98 everything you didn't get and don't want.
  99
 100  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 101 ///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
 102 \\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 103  \\\  Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html  ///