Mercurial > hg > xemacs-beta

diff lisp/font.el @ 388:aabb7f5b1c81 r21-2-9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-9
author cvs
date Mon, 13 Aug 2007 11:09:42 +0200
parents 8626e4521993
children
line wrap: on
line diff
--- a/lisp/font.el	Mon Aug 13 11:08:51 2007 +0200
+++ b/lisp/font.el	Mon Aug 13 11:09:42 2007 +0200
@@ -596,9 +596,10 @@
 ;;;###autoload
 (defun font-default-object-for-device (&optional device)
   (let ((font (font-default-font-for-device device)))
-    (unless (cdr-safe (assoc font font-default-cache))
-      (push (cons font (font-create-object font)) font-default-cache)
-      (cdr-safe (assoc font font-default-cache)))))
+    (or (cdr-safe (assoc font font-default-cache))
+	(let ((object (font-create-object font)))
+	  (push (cons font object) font-default-cache)
+	  object))))
 
 ;;;###autoload
 (defun font-default-family-for-device (&optional device)