[Emacs-diffs] Changes to emacs/src/xterm.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.804.2.13 emacs/src/xterm.c:1.804.2.14
*** emacs/src/xterm.c:1.804.2.13        Fri Aug 27 07:00:34 2004
--- emacs/src/xterm.c   Tue Sep 21 09:34:11 2004
***************
*** 10611,10620 ****
      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;
      pixels = DisplayWidth (dpyinfo->display, screen_number);
      mm = DisplayWidthMM (dpyinfo->display, screen_number);
!     dpyinfo->resx = pixels * 25.4 / mm;
    }
  
    dpyinfo->Xatom_wm_protocols
--- 10611,10622 ----
      int screen_number = XScreenNumberOfScreen (dpyinfo->screen);
      double pixels = DisplayHeight (dpyinfo->display, screen_number);
      double mm = DisplayHeightMM (dpyinfo->display, screen_number);
!     /* 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 = (mm < 1) ? 100 : pixels * 25.4 / mm;
    }
  
    dpyinfo->Xatom_wm_protocols