Mercurial > hg > xemacs-beta

diff lisp/faces.el @ 5597:79a1a759ec3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prevent bogus caching of background in custom-properties
author Vin Shelton <acs@xemacs.org>
date Tue, 15 Nov 2011 20:19:20 -0500
parents 071b810ceb18
children b0d712bbc2a6
line wrap: on
line diff
--- a/lisp/faces.el	Sun Nov 13 17:13:52 2011 +0000
+++ b/lisp/faces.el	Tue Nov 15 20:19:20 2011 -0500
@@ -1586,7 +1586,6 @@
 		  (device-type (frame-device frame)))
 	'class (device-class (frame-device frame))
 	'background (or frame-background-mode
-			(frame-property frame 'background-mode)
 			(get-frame-background-mode frame))))
 
 (defcustom init-face-from-resources t
@@ -1647,15 +1646,7 @@
 (defun get-custom-frame-properties (&optional frame)
   "Return a plist with the frame properties of FRAME used by custom.
 If FRAME is nil, return the default frame properties."
-  (cond (frame
-	 ;; Try to get from cache.
-	 (let ((cache (frame-property frame 'custom-properties)))
-	   (unless cache
-	     ;; Oh well, get it then.
-	     (setq cache (extract-custom-frame-properties frame))
-	     ;; and cache it...
-	     (set-frame-property frame 'custom-properties cache))
-	   cache))
+  (cond (frame (extract-custom-frame-properties frame))
 	(default-custom-frame-properties)
 	(t
 	 (setq default-custom-frame-properties