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.

Fixes: debbugs:9982

2 files changed, 9 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24b8d2aed98..1d3bb0b50bf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-29  Chong Yidong  <cyd@gnu.org>
+
+        * 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  <naesten@gmail.com>  (tiny change)
 
         * custom.el (defcustom): Add doc link to Lisp manual (Bug#10635).
diff --git a/lisp/dynamic-setting.el b/lisp/dynamic-setting.el
index 8343d389f80..e04af7800fc 100644
--- a/lisp/dynamic-setting.el
+++ b/lisp/dynamic-setting.el
@@ -74,9 +74,10 @@ current form for the frame (i.e. hinting or somesuch changed)."
                                         :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))))))