From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 29 Jun 2012 11:19:27 +0000 (+0200)
Subject: updated for version 7.3.572
X-Git-Tag: v7.3.572
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a53c60d33c917455857de96a44e109da7d305d8a;p=thirdparty%2Fvim.git

updated for version 7.3.572
Problem:    Duplicate statement in if and else. (Dominique Pelle)
Solution:   Remove the condition and add a TODO.
---

diff --git a/src/gui_xmebw.c b/src/gui_xmebw.c
index 5b6508867c..f7d59fcc51 100644
--- a/src/gui_xmebw.c
+++ b/src/gui_xmebw.c
@@ -375,11 +375,8 @@ set_pixmap(XmEnhancedButtonWidget eb)
 
     XGetGeometry(dpy, pix, &root, &x, &y, &width, &height, &border, &depth);
 
-    if (eb->enhancedbutton.label_location == (int)XmTOP
-	    || eb->enhancedbutton.label_location == (int)XmBOTTOM)
-	shift = eb->primitive.shadow_thickness / 2;
-    else
-	shift = eb->primitive.shadow_thickness / 2;
+    /* TODO: does the shift depend on label_location somehow? */
+    shift = eb->primitive.shadow_thickness / 2;
 
     if (shift < 1)
 	shift = 1;
diff --git a/src/version.c b/src/version.c
index 8c3c8358cc..d424af75f8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    572,
 /**/
     571,
 /**/