X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Ffont.el;h=28bb05dd9982341ad29b4ed3b1fb59ff50901785;hb=refs%2Fremotes%2Forigin%2Funlabeled-1.1.1;hp=b6baa2980368450685dadf3834f47bb6e9038988;hpb=77dcef404dc78635f6ffa8f71a803d2bc7cc8921;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/font.el b/lisp/font.el
index b6baa29..28bb05d 100644
--- a/lisp/font.el
+++ b/lisp/font.el
@@ -596,9 +596,10 @@ for use in the 'weight' field of an X font string.")
 ;;;###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)