To: vim-dev@vim.org
Subject: Patch 5.6.004 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
------------

Patch 5.6.004 (extra)
Problem:    Win32 GUI with IME: When setting 'guifont' to "*", the font
	    requester appears twice.
Solution:   In gui_mch_init_font() don't call get_logfont() but copy
	    norm_logfont from fh. (Yasuhiro Matsumoto)
Files:	    src/gui_w32.c


*** ../vim-5.6.3/src/gui_w32.c	Fri Jan 14 20:14:43 2000
--- src/gui_w32.c	Fri Jan 21 10:30:27 2000
***************
*** 2632,2638 ****
      GuiFont	font = (GuiFont)0;
      char	*p;
  
- 
      /* Load the font */
      if (get_logfont(&lf, font_name))
  	font = get_font_handle(&lf);
--- 2632,2637 ----
***************
*** 2641,2647 ****
      if (font_name == NULL)
  	font_name = lf.lfFaceName;
  #ifdef MULTI_BYTE_IME
!     get_logfont(&norm_logfont, font_name);
  #endif
      gui_mch_free_font(gui.norm_font);
      gui.norm_font = font;
--- 2640,2646 ----
      if (font_name == NULL)
  	font_name = lf.lfFaceName;
  #ifdef MULTI_BYTE_IME
!     norm_logfont = lf;
  #endif
      gui_mch_free_font(gui.norm_font);
      gui.norm_font = font;
*** ../vim-5.6.3//src/version.c	Fri Jan 21 11:10:27 2000
--- src/version.c	Fri Jan 21 12:11:33 2000
***************
*** 420,421 ****
--- 420,423 ----
  {   /* Add new patch number below this line */
+ /**/
+     4,
  /**/

-- 
FIRST HEAD: All right! All right! We'll kill him first and then have tea and
            biscuits.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

--/-/---- Bram Moolenaar ---- Bram@moolenaar.net ---- Bram@vim.org ---\-\--
  \ \    www.vim.org/iccf      www.moolenaar.net       www.vim.org    / /