[Emacs-diffs] /srv/bzr/emacs/trunk r106999: Fix an instance of dynamic-setting.el clobbering the default face.

[Chong Yidong]

------------------------------------------------------------
revno: 106999
fixes bug(s): http://debbugs.gnu.org/9982
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2012-01-29 21:55:09 +0800
message:
  Fix an instance of dynamic-setting.el clobbering the default face.
  
  * lisp/dynamic-setting.el (font-setting-change-default-font): Don't
  change the default face if SET-FONT argument is non-nil.
modified:
  lisp/ChangeLog
  lisp/dynamic-setting.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-01-29 10:01:20 +0000
+++ b/lisp/ChangeLog    2012-01-29 13:55:09 +0000
@@ -1,3 +1,8 @@
+2012-01-29  Chong Yidong  <address@hidden>
+
+       * dynamic-setting.el (font-setting-change-default-font): Don't
+       change the default face if SET-FONT argument is non-nil (Bug#9982).
+
 2012-01-29  Samuel Bronson  <address@hidden>  (tiny change)
 
        * custom.el (defcustom): Add doc link to Lisp manual (Bug#10635).

=== modified file 'lisp/dynamic-setting.el'
--- a/lisp/dynamic-setting.el   2012-01-19 07:21:25 +0000
+++ b/lisp/dynamic-setting.el   2012-01-29 13:55:09 +0000
@@ -74,9 +74,10 @@
                                        :font font-to-set))))))
 
       ;; Set for future frames.
-      (set-face-attribute 'default t :font new-font)
-      (let ((spec (list (list t (face-attr-construct 'default)))))
-       (progn
+      (when set-font
+       ;; FIXME: this is not going to play well with Custom themes.
+       (set-face-attribute 'default t :font new-font)
+       (let ((spec (list (list t (face-attr-construct 'default)))))
          (put 'default 'customized-face spec)
          (custom-push-theme 'theme-face 'default 'user 'set spec)
          (put 'default 'face-modified nil))))))