To: vim-dev@vim.org
Subject: Patch 6.1b.032
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.1b.032
Problem:    Athena: Setting a color scheme before the GUI has started causes a
	    crash. (Todd Blumer)
Solution:   Don't try using color names that haven't been set yet.
Files:	    src/gui_athena.c


*** ../vim61b.031/src/gui_athena.c	Thu Feb 21 21:05:29 2002
--- src/gui_athena.c	Thu Mar 21 22:36:36 2002
***************
*** 1679,1692 ****
       * Get the colors ourselves.  Using the automatic conversion doesn't
       * handle looking for approximate colors.
       */
!     gui.menu_fg_pixel = gui_get_color((char_u *)gui.rsrc_menu_fg_name);
!     gui.menu_bg_pixel = gui_get_color((char_u *)gui.rsrc_menu_bg_name);
!     gui.scroll_fg_pixel = gui_get_color((char_u *)gui.rsrc_scroll_fg_name);
!     gui.scroll_bg_pixel = gui_get_color((char_u *)gui.rsrc_scroll_bg_name);
  #ifdef FEAT_BEVAL
!     gui.tooltip_fg_pixel = gui_get_color((char_u *)gui.rsrc_tooltip_fg_name);
!     gui.tooltip_bg_pixel = gui_get_color((char_u *)gui.rsrc_tooltip_bg_name);
  #endif
  }
  
  
--- 1679,1695 ----
       * Get the colors ourselves.  Using the automatic conversion doesn't
       * handle looking for approximate colors.
       */
!     if (gui.in_use)
!     {
! 	gui.menu_fg_pixel = gui_get_color((char_u *)gui.rsrc_menu_fg_name);
! 	gui.menu_bg_pixel = gui_get_color((char_u *)gui.rsrc_menu_bg_name);
! 	gui.scroll_fg_pixel = gui_get_color((char_u *)gui.rsrc_scroll_fg_name);
! 	gui.scroll_bg_pixel = gui_get_color((char_u *)gui.rsrc_scroll_bg_name);
  #ifdef FEAT_BEVAL
! 	gui.tooltip_fg_pixel = gui_get_color((char_u *)gui.rsrc_tooltip_fg_name);
! 	gui.tooltip_bg_pixel = gui_get_color((char_u *)gui.rsrc_tooltip_bg_name);
  #endif
+     }
  }
  
  
*** ../vim61b.031/src/version.c	Thu Mar 21 21:36:25 2002
--- src/version.c	Thu Mar 21 22:37:43 2002
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     32,
  /**/

-- 
SUPERIMPOSE "England AD 787".  After a few more seconds we hear hoofbeats in
the distance.  They come slowly closer.  Then out of the mist comes KING
ARTHUR followed by a SERVANT who is banging two half coconuts together.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
///   Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim   \\\
\\\           Project leader for A-A-P -- http://www.a-a-p.org           ///
 \\\  Help me helping AIDS orphans in Uganda - http://iccf-holland.org  ///