diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-08-03 20:02:28 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-08-03 20:02:28 +0000 |
| commit | 179af2c90b937c27a8bac1d985c89e0972dfbb0a (patch) | |
| tree | cf1d01715e515f2a2833ff650ee850fb9577d53b | |
| parent | ef04586d9ff1b2c9a46b470cafbf12f393a159ea (diff) | |
| download | vim-git-7.1.049.tar.gz | |
updated for version 7.1-049v7.1.049
| -rw-r--r-- | src/feature.h | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/feature.h b/src/feature.h index aa694e66e..734f6e64c 100644 --- a/src/feature.h +++ b/src/feature.h @@ -673,7 +673,7 @@ # define ESC_CHG_TO_ENG_MODE /* if defined, when ESC pressed, * turn to english mode */ -# if !defined(FEAT_XFONTSET) && defined(HAVE_X11) +# if !defined(FEAT_XFONTSET) && defined(HAVE_X11) && !defined(HAVE_GTK2) # define FEAT_XFONTSET /* Hangul input requires xfontset */ # endif # if defined(FEAT_XIM) && !defined(LINT) diff --git a/src/version.c b/src/version.c index 31841b3d5..a9ec99173 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 49, +/**/ 48, /**/ 47, |