updated for version 7.1-049

diff --git a/src/feature.h b/src/feature.h
index aa694e66eb09f303eab63cb34e0ed8be946133d1..734f6e64c1454b395cca8a4bcc72fda789260ab8 100644 (file)
--- 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 31841b3d5f346058378946c597a6fa9230845a55..a9ec99173928cd1423ca09b6089a2724ae56ce74 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    49,
 /**/
     48,
 /**/