diff options
| author | Miles Bader <miles@gnu.org> | 2008-01-22 23:53:46 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-01-22 23:53:46 +0000 |
| commit | 1bad168e59601c1c843a38b2962e77b29f497f11 (patch) | |
| tree | 26f29332811458573579bb0b807ff85a8d32b807 /lisp/frame.el | |
| parent | 22f9eb9e4f09de5570ba5ede033b0a8f0973a0e9 (diff) | |
| parent | 645b6388d5bae5304098c1e773694beffc3478e9 (diff) | |
| download | emacs-1bad168e59601c1c843a38b2962e77b29f497f11.tar.gz | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1006
Diffstat (limited to 'lisp/frame.el')
| -rw-r--r-- | lisp/frame.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index 64e504d1c07..92b102a0878 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -1254,7 +1254,7 @@ displays not explicitely specified." (defun display-mm-height (&optional display) "Return the height of DISPLAY's screen in millimeters. -System values can be overriden by `display-mm-dimensions-alist'. +System values can be overridden by `display-mm-dimensions-alist'. If the information is unavailable, value is nil." (and (memq (framep-on-display display) '(x w32 mac)) (or (cddr (assoc (or display (frame-parameter nil 'display)) @@ -1264,7 +1264,7 @@ If the information is unavailable, value is nil." (defun display-mm-width (&optional display) "Return the width of DISPLAY's screen in millimeters. -System values can be overriden by `display-mm-dimensions-alist'. +System values can be overridden by `display-mm-dimensions-alist'. If the information is unavailable, value is nil." (and (memq (framep-on-display display) '(x w32 mac)) (or (cadr (assoc (or display (frame-parameter nil 'display)) |