[PATCH 21.4 21.5] Prevent bogus caching of background in custom-properties

Aidan - Here is your patch with a ChangeLog supplied. If I hear no objection within the next couple of days, I will apply this patch to both 21.4 and 21.5. Thanks, Vin diff -r 5e1c1e53103c lisp/ChangeLog --- a/lisp/ChangeLog Sun Apr 03 09:59:56 2011 -0400 +++ b/lisp/ChangeLog Mon Nov 14 22:14:50 2011 -0500 ＠＠ -1,0 +1,7 ＠＠ +2011-11-14 Vin Shelton <acs(a)xemacs.org&gt; + + * faces.el: When the default background was changed from light to + dark or vice versa, the custom-property cache maintained the old + value, preventing face definitions from choosing the proper + values. Patch from Aidan Kehoe. + diff -r 5e1c1e53103c lisp/faces.el --- a/lisp/faces.el Sun Apr 03 09:59:56 2011 -0400 +++ b/lisp/faces.el Mon Nov 14 22:15:03 2011 -0500 ＠＠ -1314,7 +1314,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 ＠＠ -1375,15 +1374,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 _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches