updated for version 7.1-225

diff --git a/src/os_unix.c b/src/os_unix.c
index 9f13a0f74319e9ff7ce11047b7d16a6182e27939..2dbf5a5fdea0a91ea55252425fb042982a56ddde 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -6145,9 +6145,9 @@ do_xterm_trace()
     if (xterm_trace == 1)
     {
        /* Get the hints just before tracking starts.  The font size might
-        * have changed recently */
-       XGetWMNormalHints(xterm_dpy, x11_window, &xterm_hints, &got_hints);
-       if (!(got_hints & PResizeInc)
+        * have changed recently. */
+       if (!XGetWMNormalHints(xterm_dpy, x11_window, &xterm_hints, &got_hints)
+               || !(got_hints & PResizeInc)
                || xterm_hints.width_inc <= 1
                || xterm_hints.height_inc <= 1)
        {

diff --git a/src/version.c b/src/version.c
index e80dbdea536ea1009ac8bfd27dd3ea0eb244851f..34003b96669332a8fa9342642171aebd95711037 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    225,
 /**/
     224,
 /**/