(defvar command-line-processed nil "t once command line has been processed")
-(defconst inhibit-startup-message nil
+(defvar inhibit-startup-message nil
"*Non-nil inhibits the initial startup message.
This is for use in your personal init file, once you are familiar
with the contents of the startup message.")
-(defconst inhibit-startup-echo-area-message nil
+(defvar inhibit-startup-echo-area-message nil
"*Non-nil inhibits the initial startup echo area message.
Inhibition takes effect only if your `.emacs' file contains
a line of this form:
Thus, someone else using a copy of your `.emacs' file will see
the startup message unless he personally acts to inhibit it.")
-(defconst inhibit-default-init nil
+(defvar inhibit-default-init nil
"*Non-nil inhibits loading the `default' library.")
-(defconst command-switch-alist nil
+(defvar command-switch-alist nil
"Alist of command-line switches.
Elements look like (SWITCH-STRING . HANDLER-FUNCTION).
HANDLER-FUNCTION receives switch name as sole arg;
Emacs runs this hook after processing the command line arguments and loading
the user's init file.")
-(defconst initial-major-mode 'lisp-interaction-mode
+(defvar initial-major-mode 'lisp-interaction-mode
"Major mode command symbol to use for the initial *scratch* buffer.")
(defvar init-file-user nil
"Identity of user whose `.emacs' file is or was read.
-The value is nil if no init file is being used; otherwise, it may be either
-the null string, meaning that the init file was taken from the user that
-originally logged in, or it may be a string containing a user's name.
+The value is nil if `-q' or `--no-init-file' was specified,
+meaning do not load any init file.
+
+Otherwise, the value may be the null string, meaning use the init file
+for the user that originally logged in, or it may be a
+string containing a user's name meaning use that person's init file.
In either of the latter cases, `(concat \"~\" init-file-user \"/\")'
evaluates to the name of the directory where the `.emacs' file was
(let ((dir command-line-default-directory)
(file-count 0)
first-file-buffer
- done
+ tem
+ just-files ;; t if this follows the magic -- option.
+ ;; This includes our standard options' long versions
+ ;; and long versions of what's on command-switch-alist.
+ (longopts
+ (append '(("--funcall") ("--load") ("--insert") ("--kill")
+ ("--directory") ("--eval") ("--find-file") ("--visit"))
+ (mapcar '(lambda (elt)
+ (list (concat "-" (car elt))))
+ command-switch-alist)))
(line 0))
- (while (and command-line-args-left (not done))
+
+ ;; Add the long X options to longopts.
+ (setq tem command-line-x-option-alist)
+ (while tem
+ (if (string-match "^--" (car (car tem)))
+ (setq longopts (cons (list (car (car tem))) longopts)))
+ (setq tem (cdr tem)))
+
+ ;; Loop, processing options.
+ (while (and command-line-args-left)
(let* ((argi (car command-line-args-left))
(orig-argi argi)
- ;; This includes our standard options' long versions
- ;; and long versions of what's on command-switch-alist.
- (longopts
- (append '(("--funcall") ("--load") ("--insert") ("--kill")
- ("--directory") ("--eval"))
- (mapcar '(lambda (elt)
- (list (concat "-" (car elt))))
- command-switch-alist)))
- tem argval completion
+ argval completion
;; List of directories specified in -L/--directory,
;; in reverse of the order specified.
extra-load-path
(initial-load-path load-path))
(setq command-line-args-left (cdr command-line-args-left))
- ;; Add the long X options to longopts.
- (setq tem command-line-x-option-alist)
- (while tem
- (if (string-match "^--" (car (car tem)))
- (setq longopts (cons (list (car (car tem))) longopts)))
- (setq tem (cdr tem)))
-
- ;; Convert long options to ordinary options
- ;; and separate out an attached option argument into argval.
- (if (string-match "^--[^=]*=" argi)
- (setq argval (substring argi (match-end 0))
- argi (substring argi 0 (1- (match-end 0)))))
- (if (equal argi "--")
- (setq completion nil)
- (setq 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 argi orig-argi)))
+ ;; Do preliminary decoding of the option.
+ (if just-files
+ ;; After --, don't look for options; treat all args as files.
+ (setq argi "")
+ ;; Convert long options to ordinary options
+ ;; and separate out an attached option argument into argval.
+ (if (string-match "^--[^=]*=" argi)
+ (setq argval (substring argi (match-end 0))
+ argi (substring argi 0 (1- (match-end 0)))))
+ (if (equal argi "--")
+ (setq completion nil)
+ (setq 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 argi orig-argi))))
;; Execute the option.
(cond ((setq tem (assoc argi command-switch-alist))
;; Ignore X-windows options and their args if not using X.
(setq command-line-args-left
(nthcdr (nth 1 tem) command-line-args-left)))
+ ((or (string-equal argi "-find-file")
+ (string-equal argi "-visit"))
+ ;; An explicit option to specify visiting a file.
+ (setq file-count (1+ file-count))
+ (let ((file
+ (expand-file-name
+ (command-line-normalize-file-name orig-argi)
+ dir)))
+ (if (= file-count 1)
+ (setq first-file-buffer (find-file file))
+ (find-file-other-window file)))
+ (or (zerop line)
+ (goto-line line))
+ (setq line 0))
((equal argi "--")
- (setq done t))
+ (setq just-files t))
(t
;; We have almost exhausted our options. See if the
;; user has made any other command-line options available
(if (string-match "\\`-" argi)
(error "Unknown option `%s'" argi))
(setq file-count (1+ file-count))
- (setq argi (command-line-normalize-file-name argi))
- (cond ((= file-count 1)
- (setq first-file-buffer
- (find-file (expand-file-name argi dir))))
- (t
- (find-file-other-window (expand-file-name argi dir))))
+ (let ((file
+ (expand-file-name
+ (command-line-normalize-file-name orig-argi)
+ dir)))
+ (if (= file-count 1)
+ (setq first-file-buffer (find-file file))
+ (find-file-other-window file)))
(or (zerop line)
(goto-line line))
(setq line 0))))))))
HCoop / bpt / emacs.git / blobdiff