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