aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.4.448

Browse Source 
Problem:    Using ETO_IGNORELANGUAGE causes problems.
Solution:   Remove this flag. (Paul Moore)
This commit is contained in:
Bram Moolenaar 2014-09-19 16:13:53 +02:00
parent b4b43bb572
commit 4ee40b0515
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui_w32.c
View File

@ -535,10 +535,6 @@ static void dyn_imm_load(void);
# define pImmSetConversionStatus ImmSetConversionStatus # define pImmSetConversionStatus ImmSetConversionStatus
#endif #endif
#ifndef ETO_IGNORELANGUAGE
# define ETO_IGNORELANGUAGE 0x1000
#endif
/* multi monitor support */ /* multi monitor support */
typedef struct _MONITORINFOstruct typedef struct _MONITORINFOstruct
{ {
@ -2500,12 +2496,6 @@ gui_mch_draw_string(
padding[i] = gui.char_width; 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 * 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 * of fixed-width fonts are often one pixel or so wider than their normal
@ -2641,10 +2631,9 @@ gui_mch_draw_string(
#endif #endif
{ {
#ifdef FEAT_RIGHTLEFT #ifdef FEAT_RIGHTLEFT
/* If we can't use ETO_IGNORELANGUAGE, we can't tell Windows not to /* Windows will mess up RL text, so we have to draw it character by
* mess up RL text, so we have to draw it character-by-character. * character. Only do this if RL is on, since it's slow. */
* Only do this if RL is on, since it's slow. */ if (curwin->w_p_rl)
if (curwin->w_p_rl && !(foptions & ETO_IGNORELANGUAGE))
RevOut(s_hdc, TEXT_X(col), TEXT_Y(row), RevOut(s_hdc, TEXT_X(col), TEXT_Y(row),
foptions, pcliprect, (char *)text, len, padding); foptions, pcliprect, (char *)text, len, padding);
else else

2
src/version.c
View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
448,
/**/ /**/
447, 447,
/**/ /**/