summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-09-11 14:17:54 +0000
committerBram Moolenaar <Bram@vim.org>2009-09-11 14:17:54 +0000
commit5e69de4421cc356f57fc19d243e03b05c970e135 (patch)
tree72164b02e160d2a210a20a767f7b2524de59ad50
parentbef9d835f5642e535ed79f353b4559faa0d8a198 (diff)
updated for version 7.2-257v7.2.257
-rw-r--r--src/gui_gtk_f.c8
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gui_gtk_f.c b/src/gui_gtk_f.c
index d88499e256..ccf54ece97 100644
--- a/src/gui_gtk_f.c
+++ b/src/gui_gtk_f.c
@@ -860,11 +860,9 @@ gtk_form_main_filter(GdkXEvent *gdk_xevent,
gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static)
{
#ifdef HAVE_GTK2
- gboolean static_gravity_supported;
-
- static_gravity_supported = gdk_window_set_static_gravities(window,
- use_static);
- g_return_if_fail(static_gravity_supported);
+ /* We don't check if static gravity is actually supported, because it
+ * results in an annoying assertion error message. */
+ gdk_window_set_static_gravities(window, use_static);
#else
XSetWindowAttributes xattributes;
diff --git a/src/version.c b/src/version.c
index d4f0b4b99b..be50d62b99 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 257,
+/**/
256,
/**/
255,