# HG changeset patch # User Bram Moolenaar # Date 1340968767 -7200 # Node ID 3ae387af405f46e200fdf9bc204d0a251864abb9 # Parent a4ced2c387437a9dd428800143360548d81628ea 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 --- 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 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 572, +/**/ 571, /**/ 570,