[Emacs-diffs] Changes to emacs/lisp/startup.el

[Colin Walters]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.296 emacs/lisp/startup.el:1.297
*** emacs/lisp/startup.el:1.296 Sat Apr 20 18:25:55 2002
--- emacs/lisp/startup.el       Sun May 26 16:49:28 2002
***************
*** 70,75 ****
--- 70,78 ----
  ;; -no-site-file             Do not load "site-start.el".  (This is the ONLY
  ;; --no-site-file            way to prevent loading that file.)
  ;; -------------------------
+ ;; -nosplash                 Don't display a splash screen on startup.
+ ;; --nosplash
+ ;; -------------------------
  ;; -u USER                   Load USER's init file instead of the init
  ;; -user USER                file belonging to the user starting Emacs.
  ;; --user USER
***************
*** 136,141 ****
--- 139,146 ----
    :type 'boolean
    :group 'initialization)
  
+ (defvaralias 'inhibit-splash-screen 'inhibit-startup-message)
+ 
  (defcustom inhibit-startup-echo-area-message nil
    "*Non-nil inhibits the initial startup echo area message.
  Setting this variable takes effect
***************
*** 753,772 ****
            (argi (pop args))
            (argval nil))
        ;; Handle --OPTION=VALUE format.
!       (if (and (string-match "\\`--" argi)
!                (string-match "=" argi))
!           (setq argval (substring argi (match-end 0))
!                 argi (substring argi 0 (match-beginning 0))))
!       (or (equal argi "--")
!           (let ((completion (try-completion argi longopts)))
!             (if (eq completion t)
!                 (setq argi (substring argi 1))
!               (if (stringp completion)
!                   (let ((elt (assoc completion longopts)))
!                     (or elt
!                         (error "Option `%s' is ambiguous" argi))
!                     (setq argi (substring (car elt) 1)))
!                 (setq argval nil)))))
        (cond
         ((member argi '("-q" "-no-init-file"))
          (setq init-file-user nil))
--- 758,777 ----
            (argi (pop args))
            (argval nil))
        ;; Handle --OPTION=VALUE format.
!       (when (and (string-match "\\`--" argi)
!                  (string-match "=" argi))
!         (setq argval (substring argi (match-end 0))
!               argi (substring argi 0 (match-beginning 0))))
!       (unless (equal argi "--")
!         (let ((completion (try-completion argi longopts)))
!           (if (eq completion t)
!               (setq argi (substring argi 1))
!             (if (stringp completion)
!                 (let ((elt (assoc completion longopts)))
!                   (or elt
!                       (error "Option `%s' is ambiguous" argi))
!                   (setq argi (substring (car elt) 1)))
!               (setq argval nil)))))
        (cond
         ((member argi '("-q" "-no-init-file"))
          (setq init-file-user nil))
***************
*** 1503,1509 ****
            ;; and long versions of what's on command-switch-alist.
            (longopts
             (append '(("--funcall") ("--load") ("--insert") ("--kill")
!                      ("--directory") ("--eval") ("--execute")
                       ("--find-file") ("--visit") ("--file"))
                     (mapcar (lambda (elt)
                               (list (concat "-" (car elt))))
--- 1508,1514 ----
            ;; and long versions of what's on command-switch-alist.
            (longopts
             (append '(("--funcall") ("--load") ("--insert") ("--kill")
!                      ("--directory") ("--eval") ("--execute") ("--nosplash")
                       ("--find-file") ("--visit") ("--file"))
                     (mapcar (lambda (elt)
                               (list (concat "-" (car elt))))
***************
*** 1555,1560 ****
--- 1560,1568 ----
                              (cons argval command-line-args-left)))
                         (funcall (cdr tem) argi))
                     (funcall (cdr tem) argi)))
+ 
+                 ((string-equal argi "-nosplash")
+                  (setq inhibit-startup-message t))
  
                  ((member argi '("-f"  ;what the manual claims
                                  "-funcall"