From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 23 Apr 2009 12:22:19 +0000 (+0000)
Subject: Revert incorrect checkin.
X-Git-Tag: emacs-pretest-23.0.93~64
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f6b94faa6e6465f7b03a602fb7c2b6a7c123f8db;p=emacs.git

Revert incorrect checkin.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index e2929e08b83..7a1f9dc392d 100644
--- 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)