Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
b9687971
Commit
b9687971
authored
Sep 08, 2004
by
Thien-Thi Nguyen
Browse files
(command-line-1): Make option
--directory/-L modify `load-path' straight away.
parent
bc9447bc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
17 deletions
+20
-17
lisp/startup.el
lisp/startup.el
+20
-17
No files found.
lisp/startup.el
View file @
b9687971
...
...
@@ -1479,12 +1479,19 @@ normal otherwise."
(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.
...
...
@@ -1553,15 +1560,15 @@ normal otherwise."
((
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
...
...
@@ -1642,10 +1649,6 @@ normal otherwise."
(
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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment