[Emacs-diffs] emacs/lisp startup.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/04/23 12:22:19

Modified files:
        lisp           : startup.el 

Log message:
        Revert incorrect checkin.

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

Patches:
Index: startup.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/startup.el,v
retrieving revision 1.528
retrieving revision 1.529
diff -u -b -r1.528 -r1.529
--- startup.el  23 Apr 2009 01:34:58 -0000      1.528
+++ startup.el  23 Apr 2009 12:22:19 -0000      1.529
@@ -499,8 +499,7 @@
                     (delete (concat "PWD=" pwd)
                             process-environment)))))
     (setq default-directory (abbreviate-file-name default-directory))
-    (let ((menubar-bindings-done nil)
-         (old-face-font-rescale-alist face-font-rescale-alist))
+    (let ((menubar-bindings-done nil))
       (unwind-protect
          (command-line)
        ;; Do this again, in case .emacs defined more abbreviations.
@@ -541,11 +540,6 @@
                  (not (and initial-window-system
                            (not noninteractive)
                            (not (eq initial-window-system 'pc)))))
-         ;; If face-font-rescale-alist has changed, reload the
-         ;; default font.
-         (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)