*** empty log message ***

[bpt/emacs.git] / lisp / startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index 0afe3d9..a2a562e 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -2,6 +2,9 @@
 
 ;; Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc.
 
+;; Maintainer: FSF
+;; Keywords: internal
+
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
@@ -18,6 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
 
 ; These are processed only at the beginning of the argument list.
 ; -batch               execute noninteractively (messages go to stdout,
@@ -48,6 +52,8 @@
 ; file                 visit file
 ; -kill                        kill (exit) emacs
 
+;;; Code:
+
 (setq top-level '(normal-top-level))
 
 (defvar command-line-processed nil "t once command line has been processed")
@@ -76,7 +82,7 @@ altering command-line-args-left to remove them.")
 
 (defvar before-init-hook nil
   "Functions to call after handling urgent options but before loading init file.
-The screen system uses this to open screens to display messages while
+The frame system uses this to open frames to display messages while
 Emacs loads the user's initialization file.")
 
 (defvar after-init-hook nil
@@ -132,13 +138,7 @@ directory name of the directory where the `.emacs' file was looked for.")
                         (setq default-directory
                               (file-name-as-directory value))))))
                '("PWD" "HOME")))
-    (let ((tail directory-abbrev-alist))
-      (while tail
-       (if (string-match (car (car tail)) default-directory)
-           (setq default-directory
-                 (concat (cdr (car tail))
-                         (substring default-directory (match-end 0)))))
-       (setq tail (cdr tail))))
+    (setq default-directory (abbreviate-file-name default-directory))
     (unwind-protect
        (command-line)
       (run-hooks 'emacs-startup-hook)
@@ -148,7 +148,7 @@ directory name of the directory where the `.emacs' file was looked for.")
           (run-hooks 'window-setup-hook)))))
 
 (defun command-line ()
-  ;; See if we should import version-control from the envionment variable.
+  ;; See if we should import version-control from the environment variable.
   (let ((vc (getenv "VERSION_CONTROL")))
     (cond ((eq vc nil))                        ;don't do anything if not set
          ((or (string= vc "t")
@@ -161,8 +161,11 @@ directory name of the directory where the `.emacs' file was looked for.")
               (string= vc "simple"))
           (setq version-control 'never))))
 
-  ;; Choose a good default value for split-window-keep-point.
-  (setq split-window-keep-point (> baud-rate 2400))
+  ;;! This has been commented out; I currently find the behavior when
+  ;;! split-window-keep-point is nil disturbing, but if I can get used
+  ;;! to it, then it would be better to eliminate the option.
+  ;;! ;; Choose a good default value for split-window-keep-point.
+  ;;! (setq split-window-keep-point (> baud-rate 2400))
 
   ;; Read window system's init file if using a window system.
   (if (and window-system (not noninteractive))
@@ -208,6 +211,11 @@ directory name of the directory where the `.emacs' file was looked for.")
 
   (run-hooks 'before-init-hook)
 
+  ;; Run the site-start library if it exists.  The point of this file is
+  ;; that it is run before .emacs.  There is no point in doing this after
+  ;; .emacs; that is useless.
+  (load "site-start" t t)
+
   ;; Load that user's init file, or the default one, or none.
   (let ((debug-on-error init-file-debug)
        ;; This function actually reads the init files.
@@ -297,6 +305,7 @@ Copyright (C) 1991 Free Software Foundation, Inc.\n\n")
        "Type C-h for help; C-x u to undo changes.  (`C-' means use CTRL key.)
 To kill the Emacs job, type C-x C-c.
 Type C-h t for a tutorial on using Emacs.
+Type C-h i to enter Info, which you can use to read GNU documentation.
 
 GNU Emacs comes with ABSOLUTELY NO WARRANTY; type C-h C-w for full details.
 You may give out copies of Emacs; type C-h C-c to see the conditions.
@@ -305,6 +314,7 @@ Type C-h C-d for information on getting the latest version.")
        "Type \\[help-command] for help; \\[advertised-undo] to undo changes.  (`C-' means use CTRL key.)
 To kill the Emacs job, type \\[save-buffers-kill-emacs].
 Type \\[help-with-tutorial] for a tutorial on using Emacs.
+Type \\[info] to enter Info, which you can use to read GNU documentation.
 
 GNU Emacs comes with ABSOLUTELY NO WARRANTY; type \\[describe-no-warranty] for full details.
 You may give out copies of Emacs; type \\[describe-copying] to see the conditions.
@@ -344,6 +354,8 @@ Type \\[describe-distribution] for information on getting the latest version."))
                 (setq command-line-args-left (cdr command-line-args-left)))
                ((or (string-equal argi "-i")
                     (string-equal argi "-insert"))
+                (or (stringp (car command-line-args-left))
+                    (error "filename omitted from `-i' option"))
                 (insert-file-contents (car command-line-args-left))
                 (setq command-line-args-left (cdr command-line-args-left)))
                ((string-equal argi "-kill")