Mercurial > emacs

changeset 103057:486d359c7e1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert incorrect checkin.
author Chong Yidong <cyd@stupidchicken.com>
date Thu, 23 Apr 2009 12:22:19 +0000
parents b6361d016a5a
children 87d48e5d2f1d
files lisp/startup.el
diffstat 1 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/startup.el	Thu Apr 23 01:34:54 2009 +0000
+++ b/lisp/startup.el	Thu Apr 23 12:22:19 2009 +0000
@@ -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)