Mercurial > emacs

diff lisp/frame.el @ 91367:c70e45a7acfd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-324
author Miles Bader <miles@gnu.org>
date Wed, 30 Jan 2008 07:57:28 +0000
parents 606f2d163a64 5d58981e6690
children
line wrap: on
line diff
--- a/lisp/frame.el	Wed Jan 30 06:40:42 2008 +0000
+++ b/lisp/frame.el	Wed Jan 30 07:57:28 2008 +0000
@@ -1254,7 +1254,7 @@
 
 (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 @@
 
 (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))