073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.448
073263
Fcc: outbox
073263
From: Bram Moolenaar <Bram@moolenaar.net>
073263
Mime-Version: 1.0
073263
Content-Type: text/plain; charset=UTF-8
073263
Content-Transfer-Encoding: 8bit
073263
------------
073263
073263
Patch 7.4.448
073263
Problem:    Using ETO_IGNORELANGUAGE causes problems.
073263
Solution:   Remove this flag. (Paul Moore)
073263
Files:	    src/gui_w32.c
073263
073263
073263
*** ../vim-7.4.447/src/gui_w32.c	2014-08-06 16:49:51.199185387 +0200
073263
--- src/gui_w32.c	2014-09-19 16:12:40.266418916 +0200
073263
***************
073263
*** 535,544 ****
073263
  # define pImmSetConversionStatus  ImmSetConversionStatus
073263
  #endif
073263
  
073263
- #ifndef ETO_IGNORELANGUAGE
073263
- # define ETO_IGNORELANGUAGE  0x1000
073263
- #endif
073263
- 
073263
  /* multi monitor support */
073263
  typedef struct _MONITORINFOstruct
073263
  {
073263
--- 535,540 ----
073263
***************
073263
*** 2500,2511 ****
073263
  		padding[i] = gui.char_width;
073263
      }
073263
  
073263
-     /* On NT, tell the font renderer not to "help" us with Hebrew and Arabic
073263
-      * text.  This doesn't work in 9x, so we have to deal with it manually on
073263
-      * those systems. */
073263
-     if (os_version.dwPlatformId == VER_PLATFORM_WIN32_NT)
073263
- 	foptions |= ETO_IGNORELANGUAGE;
073263
- 
073263
      /*
073263
       * We have to provide the padding argument because italic and bold versions
073263
       * of fixed-width fonts are often one pixel or so wider than their normal
073263
--- 2496,2501 ----
073263
***************
073263
*** 2641,2650 ****
073263
  #endif
073263
      {
073263
  #ifdef FEAT_RIGHTLEFT
073263
! 	/* If we can't use ETO_IGNORELANGUAGE, we can't tell Windows not to
073263
! 	 * mess up RL text, so we have to draw it character-by-character.
073263
! 	 * Only do this if RL is on, since it's slow. */
073263
! 	if (curwin->w_p_rl && !(foptions & ETO_IGNORELANGUAGE))
073263
  	    RevOut(s_hdc, TEXT_X(col), TEXT_Y(row),
073263
  			 foptions, pcliprect, (char *)text, len, padding);
073263
  	else
073263
--- 2631,2639 ----
073263
  #endif
073263
      {
073263
  #ifdef FEAT_RIGHTLEFT
073263
! 	/* Windows will mess up RL text, so we have to draw it character by
073263
! 	 * character.  Only do this if RL is on, since it's slow. */
073263
! 	if (curwin->w_p_rl)
073263
  	    RevOut(s_hdc, TEXT_X(col), TEXT_Y(row),
073263
  			 foptions, pcliprect, (char *)text, len, padding);
073263
  	else
073263
*** ../vim-7.4.447/src/version.c	2014-09-19 16:04:08.050417797 +0200
073263
--- src/version.c	2014-09-19 16:13:14.102418990 +0200
073263
***************
073263
*** 743,744 ****
073263
--- 743,746 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     448,
073263
  /**/
073263
073263
-- 
073263
Send $25.00 for handy leaflet on how to make money by selling leaflets
073263
073263
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
073263
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
073263
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
073263
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///