diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-06-29 13:19:27 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-06-29 13:19:27 +0200 |
| commit | a53c60d33c917455857de96a44e109da7d305d8a (patch) | |
| tree | 713a8fa3cd960e923c1f1f9600ebfcfbcf9ca92e | |
| parent | f6a2b08c5444712ddb106547695cc4d59652ce7a (diff) | |
| download | vim-git-a53c60d33c917455857de96a44e109da7d305d8a.tar.gz | |
updated for version 7.3.572v7.3.572
Problem: Duplicate statement in if and else. (Dominique Pelle)
Solution: Remove the condition and add a TODO.
| -rw-r--r-- | src/gui_xmebw.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/gui_xmebw.c b/src/gui_xmebw.c index 5b6508867..f7d59fcc5 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 8c3c8358c..d424af75f 100644 --- 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, |