Revert incorrect checkin.

diff --git a/lisp/startup.el b/lisp/startup.el
index e2929e08b8353776ffdda3e627d2e06295fed560..7a1f9dc392d9157680410b9bbaa6c83dd3217a79 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -499,8 +499,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
                     (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 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
                  (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)