(x_term_init): Work around a bug in some X servers.

2 files changed, 8 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9cd8931ff8a..e71a0e3217d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xterm.c (x_term_init): Work around a bug in some X servers.
+
 2004-09-18  Richard M. Stallman  <rms@gnu.org>
 
         * buffer.c (syms_of_buffer) <default-major-mode>: Doc fix.
diff --git a/src/xterm.c b/src/xterm.c
index c1bfd11985e..acbb30ef21b 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10432,10 +10432,12 @@ x_term_init (display_name, xrm_option, resource_name)
     int screen_number = XScreenNumberOfScreen (dpyinfo->screen);
     double pixels = DisplayHeight (dpyinfo->display, screen_number);
     double mm = DisplayHeightMM (dpyinfo->display, screen_number);
-    dpyinfo->resy = pixels * 25.4 / mm;
+    /* Mac OS X 10.3's Xserver sometimes reports 0.0mm.  */
+    dpyinfo->resy = (mm < 1) ? 100 : pixels * 25.4 / mm;
     pixels = DisplayWidth (dpyinfo->display, screen_number);
+    /* Mac OS X 10.3's Xserver sometimes reports 0.0mm.  */
     mm = DisplayWidthMM (dpyinfo->display, screen_number);
-    dpyinfo->resx = pixels * 25.4 / mm;
+    dpyinfo->resx = (mm < 1) ? 100 : pixels * 25.4 / mm;
   }
 
   dpyinfo->Xatom_wm_protocols