To: vim-dev@vim.org
Subject: Patch 6.3a.021
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.3a.021 (after 6.3a.017)
Problem:    Can't compile with X11 but without GUI.
Solution:   Put use of "gui.in_use" inside an #ifdef.
Files:	    src/eval.c


*** ../vim-6.3a.020/src/eval.c	Wed May 12 21:56:02 2004
--- src/eval.c	Fri May 14 11:29:48 2004
***************
*** 6605,6611 ****
      static void
  make_connection()
  {
!     if (X_DISPLAY == NULL && !gui.in_use)
      {
  	x_force_connect = TRUE;
  	setup_term_clip();
--- 6605,6615 ----
      static void
  make_connection()
  {
!     if (X_DISPLAY == NULL
! #ifdef FEAT_GUI
! 	    && !gui.in_use
! #endif
! 	    )
      {
  	x_force_connect = TRUE;
  	setup_term_clip();
*** ../vim-6.3a.020/src/version.c	Thu May 13 15:14:22 2004
--- src/version.c	Fri May 14 12:44:45 2004
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     21,
  /**/

-- 
       "To whoever finds this note -
       I have been imprisoned by my father who wishes me to marry
       against my will.  Please please please please come and rescue me.
       I am in the tall tower of Swamp Castle."
   SIR LAUNCELOT's eyes light up with holy inspiration.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\  Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html ///