(mouse-choose-completion): New function.

[gnu-emacs] / lisp / startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index 10777d018e19b16616561987f2b1ba5919702f55..49a423f8a7aeabd26ce95bdd6303b0bd69ebe50c 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
@@ -147,7 +146,8 @@ directory name of the directory where the `.emacs' file was looked for.")
       (run-hooks 'emacs-startup-hook)
       (and term-setup-hook
           (run-hooks 'term-setup-hook))
-      (frame-notice-user-settings)
+      (if (fboundp 'frame-notice-user-settings)
+         (frame-notice-user-settings))
       (and window-setup-hook
           (run-hooks 'window-setup-hook)))))
 
@@ -214,9 +214,10 @@ directory name of the directory where the `.emacs' file was looked for.")
     (setcdr command-line-args args))
 
   ;; Under X Windows, this creates the X frame and deletes the terminal frame.
-  (frame-initialize)
-
-  (face-initialize)
+  (if (fboundp 'frame-initialize)
+      (frame-initialize))
+  (if (fboundp 'face-initialize)
+      (face-initialize))
 
   (run-hooks 'before-init-hook)
 
@@ -293,6 +294,14 @@ directory name of the directory where the `.emacs' file was looked for.")
                  (run-hooks 'term-setup-hook))
             ;; Don't let the hook be run twice.
             (setq term-setup-hook nil)
+
+            ;; It's important to notice the user settings before we
+            ;; display the startup message; otherwise, the settings
+            ;; won't take effect until the user gives the first
+            ;; keystroke, and that's distracting.
+            (if (fboundp 'frame-notice-user-settings)
+                (frame-notice-user-settings))
+
             (and window-setup-hook
                  (run-hooks 'window-setup-hook))
             (setq window-setup-hook nil)
@@ -361,10 +370,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")
@@ -395,7 +403,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