Mercurial > emacs
diff lisp/startup.el @ 89971:cce1c0ee76ee
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-36
Merge from emacs--cvs-trunk--0, emacs--gnus--5.10, gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Merge from emacs--gnus--5.10, gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-524
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-534
Update from CVS
* miles@gnu.org--gnu-2004/emacs--gnus--5.10--base-0
tag of miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-464
* miles@gnu.org--gnu-2004/emacs--gnus--5.10--patch-1
Import from CVS branch gnus-5_10-branch
* miles@gnu.org--gnu-2004/emacs--gnus--5.10--patch-2
Merge from lorentey@elte.hu--2004/emacs--multi-tty--0, emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/emacs--gnus--5.10--patch-3
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--gnus--5.10--patch-4
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-18
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-19
Remove autoconf-generated files from archive
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-20
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 09 Sep 2004 09:36:36 +0000 |
parents | 3219f94257bc 5ce2d0959cd2 |
children | 0796fc36c2bd |
line wrap: on
line diff
--- a/lisp/startup.el Sun Sep 05 01:53:47 2004 +0000 +++ b/lisp/startup.el Thu Sep 09 09:36:36 2004 +0000 @@ -1482,12 +1482,19 @@ (file-count 0) first-file-buffer tem - ;; The directories listed in --directory/-L options will *appear* - ;; at the front of `load-path' in the order they appear on the - ;; command-line. We cannot do this by *placing* them at the front - ;; in the order they appear, so we need this variable to hold them, - ;; temporarily. - extra-load-path + ;; This approach loses for "-batch -L DIR --eval "(require foo)", + ;; if foo is intended to be found in DIR. + ;; + ;; ;; The directories listed in --directory/-L options will *appear* + ;; ;; at the front of `load-path' in the order they appear on the + ;; ;; command-line. We cannot do this by *placing* them at the front + ;; ;; in the order they appear, so we need this variable to hold them, + ;; ;; temporarily. + ;; extra-load-path + ;; + ;; To DTRT we keep track of the splice point and modify `load-path' + ;; straight away upon any --directory/-L option. + splice 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. @@ -1556,15 +1563,15 @@ ((member argi '("-eval" "-execute")) (eval (read (or argval (pop command-line-args-left))))) - ;; Set the default directory as specified in -L. ((member argi '("-L" "-directory")) - (setq tem (or argval (pop command-line-args-left))) - ;; We will reverse `extra-load-path' and prepend it to - ;; `load-path' after all the arguments have been processed. - (push - (expand-file-name (command-line-normalize-file-name tem)) - extra-load-path)) + (setq tem (expand-file-name + (command-line-normalize-file-name + (or argval (pop command-line-args-left))))) + (cond (splice (setcdr splice (cons tem (cdr splice))) + (setq splice (cdr splice))) + (t (setq load-path (cons tem load-path) + splice load-path)))) ((member argi '("-l" "-load")) (let* ((file (command-line-normalize-file-name @@ -1645,10 +1652,6 @@ (move-to-column (1- column))) (setq column 0)))))))) - ;; See --directory/-L option above. - (when extra-load-path - (setq load-path (append (nreverse extra-load-path) load-path))) - ;; If 3 or more files visited, and not all visible, ;; show user what they all are. But leave the last one current. (and (> file-count 2)