lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
b9b52a2
To: vim-dev@vim.org
b9b52a2
Subject: Patch 7.3.019
b9b52a2
Fcc: outbox
b9b52a2
From: Bram Moolenaar <Bram@moolenaar.net>
b9b52a2
Mime-Version: 1.0
b9b52a2
Content-Type: text/plain; charset=UTF-8
b9b52a2
Content-Transfer-Encoding: 8bit
b9b52a2
------------
b9b52a2
b9b52a2
Patch 7.3.019
b9b52a2
Problem:    ":nbstart" can fail silently.
b9b52a2
Solution:   Give an error when netbeans is not supported by the GUI. (Xavier
b9b52a2
	    de Gaye)
b9b52a2
Files:	    src/netbeans.c
b9b52a2
b9b52a2
b9b52a2
*** ../vim-7.3.018/src/netbeans.c	2010-09-29 17:26:57.000000000 +0200
b9b52a2
--- src/netbeans.c	2010-09-29 17:35:37.000000000 +0200
b9b52a2
***************
b9b52a2
*** 2773,2778 ****
b9b52a2
--- 2773,2788 ----
b9b52a2
  ex_nbstart(eap)
b9b52a2
      exarg_T	*eap;
b9b52a2
  {
b9b52a2
+ #ifdef FEAT_GUI
b9b52a2
+ # if !defined(FEAT_GUI_X11) && !defined(FEAT_GUI_GTK)  \
b9b52a2
+                 && !defined(FEAT_GUI_W32)
b9b52a2
+     if (gui.in_use)
b9b52a2
+     {
b9b52a2
+         EMSG(_("E838: netbeans is not supported with this GUI"));
b9b52a2
+         return;
b9b52a2
+     }
b9b52a2
+ # endif
b9b52a2
+ #endif
b9b52a2
      netbeans_open((char *)eap->arg, FALSE);
b9b52a2
  }
b9b52a2
  
b9b52a2
*** ../vim-7.3.018/src/version.c	2010-09-29 18:42:25.000000000 +0200
b9b52a2
--- src/version.c	2010-09-30 21:02:03.000000000 +0200
b9b52a2
***************
b9b52a2
*** 716,717 ****
b9b52a2
--- 716,719 ----
b9b52a2
  {   /* Add new patch number below this line */
b9b52a2
+ /**/
b9b52a2
+     19,
b9b52a2
  /**/
b9b52a2
b9b52a2
-- 
b9b52a2
hundred-and-one symptoms of being an internet addict:
b9b52a2
233. You start dreaming about web pages...in html.
b9b52a2
b9b52a2
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
b9b52a2
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
b9b52a2
\\\        download, build and distribute -- http://www.A-A-P.org        ///
b9b52a2
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///