updated for version 7.4a.024

Problem:    X11 GUI: Checking icon height twice.
Solution:   Check height and width. (Dominique Pelle)

diff --git a/src/gui_x11.c b/src/gui_x11.c
index f09d1a0c364aea1765f6be78a7aad98b36090d81..ed71b26ce87d63fd95c2063588bbf03d2e1ad10f 100644 (file)
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -1503,14 +1503,13 @@ gui_mch_init()
     if (XGetIconSizes(XtDisplay(vimShell), root_window,
                                                   &size, &number_sizes) != 0)
     {
-
        if (number_sizes > 0)
        {
-           if (size->max_height >= 48 && size->max_height >= 48)
+           if (size->max_height >= 48 && size->max_width >= 48)
                magick = vim48x48;
-           else if (size->max_height >= 32 && size->max_height >= 32)
+           else if (size->max_height >= 32 && size->max_width >= 32)
                magick = vim32x32;
-           else if (size->max_height >= 16 && size->max_height >= 16)
+           else if (size->max_height >= 16 && size->max_width >= 16)
                magick = vim16x16;
        }
     }

diff --git a/src/version.c b/src/version.c
index 59e67432cbfda84fafaca08229ef652fc3aff897..d8c9cc271dc427d8e90f188160302d1adf421149 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -727,6 +727,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    24,
 /**/
     23,
 /**/