Index: frame.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/frame.el,v
retrieving revision 1.236
diff -u -r1.236 frame.el
--- frame.el	25 Mar 2006 07:40:18 -0000	1.236
+++ frame.el	11 Jul 2006 18:40:03 -0000
@@ -1081,17 +1081,35 @@
      (t
       (frame-width (if (framep display) display (selected-frame)))))))
 
+(defcustom display-mm-height nil
+  "Height of display in millimeters.
+If non-nil, used as return value for function `display-mm-height'."
+  :version "22.1"
+  :type 'integer
+  :group 'frames)
+
 (defun display-mm-height (&optional display)
   "Return the height of DISPLAY's screen in millimeters.
-If the information is unavailable, value is nil."
-  (and (memq (framep-on-display display) '(x w32 mac))
-       (x-display-mm-height display)))
+If the information is unavailable, value is nil.  Return value of
+variable `display-mm-height' if set."
+  (or display-mm-height
+      (and (memq (framep-on-display display) '(x w32 mac))
+	   (x-display-mm-height display))))
+
+(defcustom display-mm-width nil
+  "Width of display in millimeters.
+If non-nil, used as return value for function `display-mm-width'."
+  :version "22.1"
+  :type 'integer
+  :group 'frames)
 
 (defun display-mm-width (&optional display)
   "Return the width of DISPLAY's screen in millimeters.
-If the information is unavailable, value is nil."
-  (and (memq (framep-on-display display) '(x w32 mac))
-       (x-display-mm-width display)))
+If the information is unavailable, value is nil.  Return value of
+variable `display-mm-width' if set."
+  (or display-mm-width
+      (and (memq (framep-on-display display) '(x w32 mac))
+	   (x-display-mm-width display))))
 
 (defun display-backing-store (&optional display)
   "Return the backing store capability of DISPLAY's screen.