(diary-display-hook): Change default and fix doc string.

[gnu-emacs] / lisp / startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index 49a423f8a7aeabd26ce95bdd6303b0bd69ebe50c..249c1d907154298f9ed00abcb00fdb5a516ccf31 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -143,11 +143,18 @@ directory name of the directory where the `.emacs' file was looked for.")
     (setq default-directory (abbreviate-file-name default-directory))
     (unwind-protect
        (command-line)
+      ;; Do this again, in case .emacs defined more abbreviations.
+      (setq default-directory (abbreviate-file-name default-directory))
       (run-hooks 'emacs-startup-hook)
       (and term-setup-hook
           (run-hooks 'term-setup-hook))
+      ;; Modify the initial frame based on what .emacs puts into
+      ;; ...-frame-alist.
       (if (fboundp 'frame-notice-user-settings)
          (frame-notice-user-settings))
+      ;; Now we know the user's default font, so add it to the menu.
+      (if (fboundp 'font-menu-add-default)
+         (font-menu-add-default))
       (and window-setup-hook
           (run-hooks 'window-setup-hook)))))