vim/patches/vim-7.3.016.patch0

   1 To: vim-dev@vim.org
   2 Subject: Patch 7.3.016
   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.016
  11 Problem:    Netbeans doesn't work under Athena.
  12 Solution:   Support Athena, just like Motif. (Xavier de Gaye)
  13 Files:      runtime/doc/netbeans.txt, src/gui.c, src/main.c, src/netbeans.c
  14
  15
  16 *** ../vim-7.3.015/runtime/doc/netbeans.txt     2010-08-15 21:57:13.000000000 +0200
  17 --- runtime/doc/netbeans.txt    2010-09-29 17:13:43.000000000 +0200
  18 ***************
  19 *** 1,4 ****
  20 ! *netbeans.txt*  For Vim version 7.3.  Last change: 2010 Jul 20
  21
  22
  23                   VIM REFERENCE MANUAL    by Gordon Prieur et al.
  24 --- 1,4 ----
  25 ! *netbeans.txt*  For Vim version 7.3.  Last change: 2010 Aug 20
  26
  27
  28                   VIM REFERENCE MANUAL    by Gordon Prieur et al.
  29 ***************
  30 *** 118,124 ****
  31   uncommenting a line with "--disable-netbeans" in the Makefile.
  32
  33   Currently the NetBeans interface is supported by Vim running in a terminal and
  34 ! by GVim when it is run with one of the following GUIs: GTK, GNOME, and Motif.
  35
  36   If Motif support is required the user must supply XPM libraries.  See
  37   |workshop-xpm| for details on obtaining the latest version of XPM.
  38 --- 118,125 ----
  39   uncommenting a line with "--disable-netbeans" in the Makefile.
  40
  41   Currently the NetBeans interface is supported by Vim running in a terminal and
  42 ! by GVim when it is run with one of the following GUIs: GTK, GNOME, Windows,
  43 ! Athena and Motif.
  44
  45   If Motif support is required the user must supply XPM libraries.  See
  46   |workshop-xpm| for details on obtaining the latest version of XPM.
  47 *** ../vim-7.3.015/src/gui.c    2010-08-15 21:57:28.000000000 +0200
  48 --- src/gui.c   2010-09-29 17:13:43.000000000 +0200
  49 ***************
  50 *** 2352,2358 ****
  51       if (draw_sign)
  52         /* Draw the sign on top of the spaces. */
  53         gui_mch_drawsign(gui.row, col, gui.highlight_mask);
  54 ! # if defined(FEAT_NETBEANS_INTG) && (defined(FEAT_GUI_MOTIF) \
  55         || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32))
  56       if (multi_sign)
  57         netbeans_draw_multisign_indicator(gui.row);
  58 --- 2352,2358 ----
  59       if (draw_sign)
  60         /* Draw the sign on top of the spaces. */
  61         gui_mch_drawsign(gui.row, col, gui.highlight_mask);
  62 ! # if defined(FEAT_NETBEANS_INTG) && (defined(FEAT_GUI_X11) \
  63         || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32))
  64       if (multi_sign)
  65         netbeans_draw_multisign_indicator(gui.row);
  66 *** ../vim-7.3.015/src/main.c   2010-08-15 21:57:28.000000000 +0200
  67 --- src/main.c  2010-09-29 17:13:43.000000000 +0200
  68 ***************
  69 *** 940,946 ****
  70       if (netbeansArg != NULL && strncmp("-nb", netbeansArg, 3) == 0)
  71       {
  72   # ifdef FEAT_GUI
  73 ! #  if !defined(FEAT_GUI_MOTIF) && !defined(FEAT_GUI_GTK)  \
  74                 && !defined(FEAT_GUI_W32)
  75         if (gui.in_use)
  76         {
  77 --- 940,946 ----
  78       if (netbeansArg != NULL && strncmp("-nb", netbeansArg, 3) == 0)
  79       {
  80   # ifdef FEAT_GUI
  81 ! #  if !defined(FEAT_GUI_X11) && !defined(FEAT_GUI_GTK)  \
  82                 && !defined(FEAT_GUI_W32)
  83         if (gui.in_use)
  84         {
  85 *** ../vim-7.3.015/src/netbeans.c       2010-08-15 21:57:26.000000000 +0200
  86 --- src/netbeans.c      2010-09-29 17:13:43.000000000 +0200
  87 ***************
  88 *** 87,93 ****
  89   static void nb_init_graphics __ARGS((void));
  90   static void coloncmd __ARGS((char *cmd, ...));
  91   static void nb_set_curbuf __ARGS((buf_T *buf));
  92 ! #ifdef FEAT_GUI_MOTIF
  93   static void messageFromNetbeans __ARGS((XtPointer, int *, XtInputId *));
  94   #endif
  95   #ifdef FEAT_GUI_GTK
  96 --- 87,93 ----
  97   static void nb_init_graphics __ARGS((void));
  98   static void coloncmd __ARGS((char *cmd, ...));
  99   static void nb_set_curbuf __ARGS((buf_T *buf));
 100 ! #ifdef FEAT_GUI_X11
 101   static void messageFromNetbeans __ARGS((XtPointer, int *, XtInputId *));
 102   #endif
 103   #ifdef FEAT_GUI_GTK
 104 ***************
 105 *** 112,118 ****
 106   static NBSOCK nbsock = -1;            /* socket fd for Netbeans connection */
 107   #define NETBEANS_OPEN (nbsock != -1)
 108
 109 ! #ifdef FEAT_GUI_MOTIF
 110   static XtInputId inputHandler = (XtInputId)NULL;  /* Cookie for input */
 111   #endif
 112   #ifdef FEAT_GUI_GTK
 113 --- 112,118 ----
 114   static NBSOCK nbsock = -1;            /* socket fd for Netbeans connection */
 115   #define NETBEANS_OPEN (nbsock != -1)
 116
 117 ! #ifdef FEAT_GUI_X11
 118   static XtInputId inputHandler = (XtInputId)NULL;  /* Cookie for input */
 119   #endif
 120   #ifdef FEAT_GUI_GTK
 121 ***************
 122 *** 143,149 ****
 123
 124       netbeans_send_disconnect();
 125
 126 ! #ifdef FEAT_GUI_MOTIF
 127       if (inputHandler != (XtInputId)NULL)
 128       {
 129         XtRemoveInput(inputHandler);
 130 --- 143,149 ----
 131
 132       netbeans_send_disconnect();
 133
 134 ! #ifdef FEAT_GUI_X11
 135       if (inputHandler != (XtInputId)NULL)
 136       {
 137         XtRemoveInput(inputHandler);
 138 ***************
 139 *** 700,706 ****
 140   /*
 141    * Read a command from netbeans.
 142    */
 143 ! #ifdef FEAT_GUI_MOTIF
 144       static void
 145   messageFromNetbeans(XtPointer clientData UNUSED,
 146                     int *unused1 UNUSED,
 147 --- 700,706 ----
 148   /*
 149    * Read a command from netbeans.
 150    */
 151 ! #ifdef FEAT_GUI_X11
 152       static void
 153   messageFromNetbeans(XtPointer clientData UNUSED,
 154                     int *unused1 UNUSED,
 155 ***************
 156 *** 2937,2943 ****
 157       if (!NB_HAS_GUI || !NETBEANS_OPEN)
 158         return;
 159
 160 ! # ifdef FEAT_GUI_MOTIF
 161       /* tell notifier we are interested in being called
 162        * when there is input on the editor connection socket
 163        */
 164 --- 2937,2943 ----
 165       if (!NB_HAS_GUI || !NETBEANS_OPEN)
 166         return;
 167
 168 ! # ifdef FEAT_GUI_X11
 169       /* tell notifier we are interested in being called
 170        * when there is input on the editor connection socket
 171        */
 172 ***************
 173 *** 3027,3033 ****
 174       }
 175   }
 176
 177 ! #if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_W32) || defined(PROTO)
 178   /*
 179    * Tell netbeans that the window was moved or resized.
 180    */
 181 --- 3027,3033 ----
 182       }
 183   }
 184
 185 ! #if defined(FEAT_GUI_X11) || defined(FEAT_GUI_W32) || defined(PROTO)
 186   /*
 187    * Tell netbeans that the window was moved or resized.
 188    */
 189 ***************
 190 *** 3458,3464 ****
 191       return FALSE;
 192   }
 193
 194 ! #if defined(FEAT_GUI_MOTIF) || defined(PROTO)
 195   /*
 196    * We have multiple signs to draw at the same location. Draw the
 197    * multi-sign indicator instead. This is the Motif version.
 198 --- 3458,3464 ----
 199       return FALSE;
 200   }
 201
 202 ! #if defined(FEAT_GUI_X11) || defined(PROTO)
 203   /*
 204    * We have multiple signs to draw at the same location. Draw the
 205    * multi-sign indicator instead. This is the Motif version.
 206 ***************
 207 *** 3487,3493 ****
 208       XDrawPoint(gui.dpy, gui.wid, gui.text_gc, x+3, y++);
 209       XDrawPoint(gui.dpy, gui.wid, gui.text_gc, x+2, y);
 210   }
 211 ! #endif /* FEAT_GUI_MOTIF */
 212
 213   #if defined(FEAT_GUI_GTK) && !defined(PROTO)
 214   /*
 215 --- 3487,3493 ----
 216       XDrawPoint(gui.dpy, gui.wid, gui.text_gc, x+3, y++);
 217       XDrawPoint(gui.dpy, gui.wid, gui.text_gc, x+2, y);
 218   }
 219 ! #endif /* FEAT_GUI_X11 */
 220
 221   #if defined(FEAT_GUI_GTK) && !defined(PROTO)
 222   /*
 223 *** ../vim-7.3.015/src/version.c        2010-09-29 16:55:45.000000000 +0200
 224 --- src/version.c       2010-09-29 17:14:47.000000000 +0200
 225 ***************
 226 *** 716,717 ****
 227 --- 716,719 ----
 228   {   /* Add new patch number below this line */
 229 + /**/
 230 +     16,
 231   /**/
 232
 233 --
 234 hundred-and-one symptoms of being an internet addict:
 235 229. You spend so much time thinking what to add on this list.
 236
 237  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 238 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 239 \\\        download, build and distribute -- http://www.A-A-P.org        ///
 240  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///