diff options
| author | Chong Yidong | 2009-04-23 12:22:19 +0000 |
|---|---|---|
| committer | Chong Yidong | 2009-04-23 12:22:19 +0000 |
| commit | f6b94faa6e6465f7b03a602fb7c2b6a7c123f8db (patch) | |
| tree | 34a2f8039793ec2b42e3aaec325da5345853d97a | |
| parent | 474749510e6da2f8250dd599f20bdc38c153f344 (diff) | |
| download | emacs-f6b94faa6e6465f7b03a602fb7c2b6a7c123f8db.tar.gz emacs-f6b94faa6e6465f7b03a602fb7c2b6a7c123f8db.zip | |
Revert incorrect checkin.
| -rw-r--r-- | lisp/startup.el | 8 |
1 files changed, 1 insertions, 7 deletions
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'." | |||
| 499 | (delete (concat "PWD=" pwd) | 499 | (delete (concat "PWD=" pwd) |
| 500 | process-environment))))) | 500 | process-environment))))) |
| 501 | (setq default-directory (abbreviate-file-name default-directory)) | 501 | (setq default-directory (abbreviate-file-name default-directory)) |
| 502 | (let ((menubar-bindings-done nil) | 502 | (let ((menubar-bindings-done nil)) |
| 503 | (old-face-font-rescale-alist face-font-rescale-alist)) | ||
| 504 | (unwind-protect | 503 | (unwind-protect |
| 505 | (command-line) | 504 | (command-line) |
| 506 | ;; Do this again, in case .emacs defined more abbreviations. | 505 | ;; Do this again, in case .emacs defined more abbreviations. |
| @@ -541,11 +540,6 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." | |||
| 541 | (not (and initial-window-system | 540 | (not (and initial-window-system |
| 542 | (not noninteractive) | 541 | (not noninteractive) |
| 543 | (not (eq initial-window-system 'pc))))) | 542 | (not (eq initial-window-system 'pc))))) |
| 544 | ;; If face-font-rescale-alist has changed, reload the | ||
| 545 | ;; default font. | ||
| 546 | (unless (eq face-font-rescale-alist | ||
| 547 | old-face-font-rescale-alist) | ||
| 548 | (set-face-attribute 'default nil :font (font-spec))) | ||
| 549 | ;; Modify the initial frame based on what .emacs puts into | 543 | ;; Modify the initial frame based on what .emacs puts into |
| 550 | ;; ...-frame-alist. | 544 | ;; ...-frame-alist. |
| 551 | (if (fboundp 'frame-notice-user-settings) | 545 | (if (fboundp 'frame-notice-user-settings) |