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

[Stefan Monnier]

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.841 emacs/src/xterm.c:1.842
*** emacs/src/xterm.c:1.841     Tue Aug 24 17:22:33 2004
--- emacs/src/xterm.c   Sat Sep 18 21:36:02 2004
***************
*** 10432,10441 ****
      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
--- 10432,10443 ----
      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