Merge emacs-25 into master (using imerge)

[gnu-emacs] / src / xsettings.c

diff --git a/src/xsettings.c b/src/xsettings.c
index 028487b91ee1a10305aab89f60dfbf8a9b01db59..f6a8bfdebd9c21d22ff299abf102c503e652cbf0 100644 (file)
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -537,10 +537,10 @@ parse_settings (unsigned char *prop,
               else
                 settings->seen &= ~SEEN_RGBA;
             }
-          else if (strcmp (name, "Xft/DPI") == 0)
+          else if (strcmp (name, "Xft/DPI") == 0 && ival != (CARD32) -1)
             {
               settings->seen |= SEEN_DPI;
-              settings->dpi = (double)ival/1024.0;
+              settings->dpi = ival / 1024.0;
             }
           else if (strcmp (name, "Xft/lcdfilter") == 0)
             {