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

[Kim F . Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.1040 emacs/src/xdisp.c:1.1041
*** emacs/src/xdisp.c:1.1040    Wed Aug 17 14:59:41 2005
--- emacs/src/xdisp.c   Thu Aug 18 11:31:22 2005
***************
*** 17622,17627 ****
--- 17622,17636 ----
          if (pixels > 0)
            {
              double ppi;
+ #ifdef HAVE_WINDOW_SYSTEM
+             if (FRAME_WINDOW_P (it->f)
+                 && (ppi = (width_p
+                            ? FRAME_X_DISPLAY_INFO (it->f)->resx
+                            : FRAME_X_DISPLAY_INFO (it->f)->resy),
+                     ppi > 0))
+               return OK_PIXELS (ppi / pixels);
+ #endif
+ 
              if ((ppi = NUMVAL (Vdisplay_pixels_per_inch), ppi > 0)
                  || (CONSP (Vdisplay_pixels_per_inch)
                      && (ppi = (width_p
***************
*** 23056,23062 ****
    scroll_margin = 0;
  
    DEFVAR_LISP ("display-pixels-per-inch",  &Vdisplay_pixels_per_inch,
!     doc: /* Pixels per inch on current display.
  Value is a number or a cons (WIDTH-DPI . HEIGHT-DPI).  */);
    Vdisplay_pixels_per_inch = make_float (72.0);
  
--- 23065,23071 ----
    scroll_margin = 0;
  
    DEFVAR_LISP ("display-pixels-per-inch",  &Vdisplay_pixels_per_inch,
!     doc: /* Pixels per inch value for non-window system displays.
  Value is a number or a cons (WIDTH-DPI . HEIGHT-DPI).  */);
    Vdisplay_pixels_per_inch = make_float (72.0);