/[emacs]/emacs/lisp/startup.el
ViewVC logotype

Diff of /emacs/lisp/startup.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.296 by gm, Sat Apr 20 22:25:55 2002 UTC revision 1.297 by walters, Sun May 26 20:49:28 2002 UTC
# Line 70  Line 70 
70  ;; -no-site-file             Do not load "site-start.el".  (This is the ONLY  ;; -no-site-file             Do not load "site-start.el".  (This is the ONLY
71  ;; --no-site-file            way to prevent loading that file.)  ;; --no-site-file            way to prevent loading that file.)
72  ;; -------------------------  ;; -------------------------
73    ;; -nosplash                 Don't display a splash screen on startup.
74    ;; --nosplash
75    ;; -------------------------
76  ;; -u USER                   Load USER's init file instead of the init  ;; -u USER                   Load USER's init file instead of the init
77  ;; -user USER                file belonging to the user starting Emacs.  ;; -user USER                file belonging to the user starting Emacs.
78  ;; --user USER  ;; --user USER
# Line 136  with the contents of the startup message Line 139  with the contents of the startup message
139    :type 'boolean    :type 'boolean
140    :group 'initialization)    :group 'initialization)
141    
142    (defvaralias 'inhibit-splash-screen 'inhibit-startup-message)
143    
144  (defcustom inhibit-startup-echo-area-message nil  (defcustom inhibit-startup-echo-area-message nil
145    "*Non-nil inhibits the initial startup echo area message.    "*Non-nil inhibits the initial startup echo area message.
146  Setting this variable takes effect  Setting this variable takes effect
# Line 753  or `CVS', and any subdirectory that cont Line 758  or `CVS', and any subdirectory that cont
758              (argi (pop args))              (argi (pop args))
759              (argval nil))              (argval nil))
760          ;; Handle --OPTION=VALUE format.          ;; Handle --OPTION=VALUE format.
761          (if (and (string-match "\\`--" argi)          (when (and (string-match "\\`--" argi)
762                   (string-match "=" argi))                     (string-match "=" argi))
763              (setq argval (substring argi (match-end 0))            (setq argval (substring argi (match-end 0))
764                    argi (substring argi 0 (match-beginning 0))))                  argi (substring argi 0 (match-beginning 0))))
765          (or (equal argi "--")          (unless (equal argi "--")
766              (let ((completion (try-completion argi longopts)))            (let ((completion (try-completion argi longopts)))
767                (if (eq completion t)              (if (eq completion t)
768                    (setq argi (substring argi 1))                  (setq argi (substring argi 1))
769                  (if (stringp completion)                (if (stringp completion)
770                      (let ((elt (assoc completion longopts)))                    (let ((elt (assoc completion longopts)))
771                        (or elt                      (or elt
772                            (error "Option `%s' is ambiguous" argi))                          (error "Option `%s' is ambiguous" argi))
773                        (setq argi (substring (car elt) 1)))                      (setq argi (substring (car elt) 1)))
774                    (setq argval nil)))))                  (setq argval nil)))))
775          (cond          (cond
776           ((member argi '("-q" "-no-init-file"))           ((member argi '("-q" "-no-init-file"))
777            (setq init-file-user nil))            (setq init-file-user nil))
# Line 1503  normal otherwise." Line 1508  normal otherwise."
1508              ;; and long versions of what's on command-switch-alist.              ;; and long versions of what's on command-switch-alist.
1509              (longopts              (longopts
1510               (append '(("--funcall") ("--load") ("--insert") ("--kill")               (append '(("--funcall") ("--load") ("--insert") ("--kill")
1511                         ("--directory") ("--eval") ("--execute")                         ("--directory") ("--eval") ("--execute") ("--nosplash")
1512                         ("--find-file") ("--visit") ("--file"))                         ("--find-file") ("--visit") ("--file"))
1513                       (mapcar (lambda (elt)                       (mapcar (lambda (elt)
1514                                 (list (concat "-" (car elt))))                                 (list (concat "-" (car elt))))
# Line 1556  normal otherwise." Line 1561  normal otherwise."
1561                           (funcall (cdr tem) argi))                           (funcall (cdr tem) argi))
1562                       (funcall (cdr tem) argi)))                       (funcall (cdr tem) argi)))
1563    
1564                      ((string-equal argi "-nosplash")
1565                       (setq inhibit-startup-message t))
1566    
1567                    ((member argi '("-f"  ;what the manual claims                    ((member argi '("-f"  ;what the manual claims
1568                                    "-funcall"                                    "-funcall"
1569                                    "-e")) ; what the source used to say                                    "-e")) ; what the source used to say

Legend:
Removed from v.1.296  
changed lines
  Added in v.1.297

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26