Blame SOURCES/7.4.448

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