summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-05-14 17:38:30 +0000
committerBram Moolenaar <Bram@vim.org>2007-05-14 17:38:30 +0000
commita2dd9009992596950d48fa5c18a80b60c72227f3 (patch)
tree48fd25677e0c26917af1bb6253bdc209f036ff8a
parent29c34723d580dfa1a640d51df02efae0229a997f (diff)
downloadvim-git-a2dd9009992596950d48fa5c18a80b60c72227f3.tar.gz
updated for version 7.1-001v7.1.001
-rw-r--r--src/gui_gtk.c4
-rw-r--r--src/gui_gtk_x11.c4
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 4 deletions
diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index da4fc42d4..094769d4b 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -53,8 +53,8 @@
# ifdef bindtextdomain
# undef bindtextdomain
# endif
-# ifdef bindtextdomain_codeset
-# undef bindtextdomain_codeset
+# ifdef bind_textdomain_codeset
+# undef bind_textdomain_codeset
# endif
# if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS)
# define ENABLE_NLS /* so the texts in the dialog boxes are translated */
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 523733926..4a13aabf6 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -36,8 +36,8 @@
# ifdef bindtextdomain
# undef bindtextdomain
# endif
-# ifdef bindtextdomain_codeset
-# undef bindtextdomain_codeset
+# ifdef bind_textdomain_codeset
+# undef bind_textdomain_codeset
# endif
# if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS)
# define ENABLE_NLS /* so the texts in the dialog boxes are translated */
diff --git a/src/version.c b/src/version.c
index ddee2077e..c0f9b4b69 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 */
/**/
+ 1,
+/**/
0
};