(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 b7552fad26b5d407c19324fe54252e63e5027dd0..249c1d907154298f9ed00abcb00fdb5a516ccf31 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -47,7 +47,6 @@
 ; -funcall function    same
 ; -l file              load file
 ; -load file           same
-; -i file              insert file into buffer
 ; -insert file         same
 ; file                 visit file
 ; -kill                        kill (exit) emacs
@@ -144,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)))))
 
@@ -371,10 +377,9 @@ Type \\[describe-distribution] for information on getting the latest version."))
                       (setq file (expand-file-name file)))
                   (load file nil t))
                 (setq command-line-args-left (cdr command-line-args-left)))
-               ((or (string-equal argi "-i")
-                    (string-equal argi "-insert"))
+               ((string-equal argi "-insert")
                 (or (stringp (car command-line-args-left))
-                    (error "filename omitted from `-i' option"))
+                    (error "filename omitted from `-insert' option"))
                 (insert-file-contents (car command-line-args-left))
                 (setq command-line-args-left (cdr command-line-args-left)))
                ((string-equal argi "-kill")
@@ -405,7 +410,7 @@ Type \\[describe-distribution] for information on getting the latest version."))
       ;; show user what they all are.
       (if (> file-count 2)
          (or (get-buffer-window first-file-buffer)
-             (progn (other-window)
+             (progn (other-window 1)
                     (buffer-menu)))))))
 
 ;;; startup.el ends here