- (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)))))