[Emacs-diffs] emacs/lisp ChangeLog startup.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/04/25 14:25:10

Modified files:
        lisp           : ChangeLog startup.el 

Log message:
        * startup.el (normal-top-level): Implement a work-around to handle
        changes to face-font-rescale-alist during initialization (Bug#1785).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15609&r2=1.15610
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/startup.el?cvsroot=emacs&r1=1.529&r2=1.530

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15609
retrieving revision 1.15610
diff -u -b -r1.15609 -r1.15610
--- ChangeLog   24 Apr 2009 13:54:50 -0000      1.15609
+++ ChangeLog   25 Apr 2009 14:25:06 -0000      1.15610
@@ -1,3 +1,9 @@
+2009-04-25  Chong Yidong  <address@hidden>
+
+       * startup.el (normal-top-level): Implement a work-around to handle
+       changes to face-font-rescale-alist during
+       initialization (Bug#1785).
+
 2009-04-24  Michael Albinus  <address@hidden>
 
        * net/tramp.el (tramp-handle-directory-files-and-attributes-with-stat)

Index: startup.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/startup.el,v
retrieving revision 1.529
retrieving revision 1.530
diff -u -b -r1.529 -r1.530
--- startup.el  23 Apr 2009 12:22:19 -0000      1.529
+++ startup.el  25 Apr 2009 14:25:09 -0000      1.530
@@ -499,7 +499,8 @@
                     (delete (concat "PWD=" pwd)
                             process-environment)))))
     (setq default-directory (abbreviate-file-name default-directory))
-    (let ((menubar-bindings-done nil))
+    (let ((menubar-bindings-done nil)
+         (old-face-font-rescale-alist face-font-rescale-alist))
       (unwind-protect
          (command-line)
        ;; Do this again, in case .emacs defined more abbreviations.
@@ -540,6 +541,19 @@
                  (not (and initial-window-system
                            (not noninteractive)
                            (not (eq initial-window-system 'pc)))))
+
+         ;; FIXME: The user's init file may change
+         ;; face-font-rescale-alist.  However, the default face
+         ;; already has an assigned font object, which does not take
+         ;; face-font-rescale-alist into account.  For such
+         ;; situations, we ought to have a way to find all font
+         ;; objects and regenerate them; currently we do not.  As a
+         ;; workaround, we specifically reset te default face's :font
+         ;; attribute here.  See bug#1785.
+         (unless (eq face-font-rescale-alist
+                     old-face-font-rescale-alist)
+           (set-face-attribute 'default nil :font (font-spec)))
+
          ;; Modify the initial frame based on what .emacs puts into
          ;; ...-frame-alist.
          (if (fboundp 'frame-notice-user-settings)