Mercurial > vim
changeset 6226:2fd96725b063 v7.4.448
updated for version 7.4.448
Problem: Using ETO_IGNORELANGUAGE causes problems.
Solution: Remove this flag. (Paul Moore)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Fri, 19 Sep 2014 16:13:53 +0200 |
| parents | 5ae112be5053 |
| children | 3898fa630d12 |
| files | src/gui_w32.c src/version.c |
| diffstat | 2 files changed, 5 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -535,10 +535,6 @@ static void dyn_imm_load(void); # define pImmSetConversionStatus ImmSetConversionStatus #endif -#ifndef ETO_IGNORELANGUAGE -# define ETO_IGNORELANGUAGE 0x1000 -#endif - /* multi monitor support */ typedef struct _MONITORINFOstruct { @@ -2500,12 +2496,6 @@ gui_mch_draw_string( padding[i] = gui.char_width; } - /* On NT, tell the font renderer not to "help" us with Hebrew and Arabic - * text. This doesn't work in 9x, so we have to deal with it manually on - * those systems. */ - if (os_version.dwPlatformId == VER_PLATFORM_WIN32_NT) - foptions |= ETO_IGNORELANGUAGE; - /* * We have to provide the padding argument because italic and bold versions * of fixed-width fonts are often one pixel or so wider than their normal @@ -2641,10 +2631,9 @@ gui_mch_draw_string( #endif { #ifdef FEAT_RIGHTLEFT - /* If we can't use ETO_IGNORELANGUAGE, we can't tell Windows not to - * mess up RL text, so we have to draw it character-by-character. - * Only do this if RL is on, since it's slow. */ - if (curwin->w_p_rl && !(foptions & ETO_IGNORELANGUAGE)) + /* Windows will mess up RL text, so we have to draw it character by + * character. Only do this if RL is on, since it's slow. */ + if (curwin->w_p_rl) RevOut(s_hdc, TEXT_X(col), TEXT_Y(row), foptions, pcliprect, (char *)text, len, padding); else