Use path-separator with -L, rather than just :

* lisp/startup.el (command-line-1): Use path-separator with -L.

* test/automated/Makefile.in (PATH_SEPARATOR): New, set by configure.
(EMACSOPT): Use PATH_SEPARATOR.

* doc/emacs/cmdargs.texi (Action Arguments): Use path-separator with -L.

* etc/NEWS: Related edit.
This commit is contained in:
Glenn Morris 2013-11-20 19:21:50 -05:00
parent 86fd16b6b4
commit 2df102287e
7 changed files with 23 additions and 3 deletions

View file

@ -1,3 +1,7 @@
2013-11-21 Glenn Morris <rgm@gnu.org>
* cmdargs.texi (Action Arguments): Use path-separator with -L.
2013-11-04 Glenn Morris <rgm@gnu.org>
* cmdargs.texi (Action Arguments): Mention that `-L :...' appends.

View file

@ -142,6 +142,8 @@ relative order; i.e., using @samp{-L /foo -L /bar} results in
a @code{load-path} of the form @code{("/foo" "/bar" @dots{})}.
If @var{dir} begins with @samp{:}, Emacs removes the @samp{:} and
appends (rather than prepends) the remainder to @code{load-path}.
(On MS Windows, use @samp{;} instead of @samp{:}; i.e., use
the value of @code{path-separator}.)
@item -f @var{function}
@opindex -f

View file

@ -64,7 +64,8 @@ To use the old backend by default, do on the command line:
+++
** The -L option, which normally prepends its argument to load-path,
will instead append, if the argument begins with `:'.
will instead append, if the argument begins with `:' (or `;' on MS Windows;
i.e., `path-separator').
* Changes in Emacs 24.4

View file

@ -1,3 +1,7 @@
2013-11-21 Glenn Morris <rgm@gnu.org>
* startup.el (command-line-1): Use path-separator with -L.
2013-11-20 Teodor Zlatanov <tzz@lifelogs.com>
* emacs-lisp/package.el (describe-package-1): Add package archive

View file

@ -2219,7 +2219,7 @@ A fancy display is used on graphic displays, normal otherwise."
;; -L :/foo adds /foo to the _end_ of load-path.
(let (append)
(if (string-match-p
"\\`:"
(format "\\`%s" path-separator)
(setq tem (or argval (pop command-line-args-left))))
(setq tem (substring tem 1)
append t))

View file

@ -1,3 +1,8 @@
2013-11-21 Glenn Morris <rgm@gnu.org>
* automated/Makefile.in (PATH_SEPARATOR): New, set by configure.
(EMACSOPT): Use PATH_SEPARATOR.
2013-11-18 Paul Eggert <eggert@cs.ucla.edu>
Improve API of recently-added bool vector functions (Bug#15912).

View file

@ -22,13 +22,17 @@ SHELL = @SHELL@
srcdir = @srcdir@
VPATH = $(srcdir)
PATH_SEPARATOR = @PATH_SEPARATOR@
# We never change directory before running Emacs, so a relative file
# name is fine, and makes life easier. If we need to change
# directory, we can use emacs --chdir.
EMACS = ../../src/emacs
# Command line flags for Emacs.
EMACSOPT = -batch --no-site-file --no-site-lisp -L :$(srcdir)
# Apparently MSYS bash would convert "-L :" to "-L ;" anyway,
# but we might as well be explicit.
EMACSOPT = -batch --no-site-file --no-site-lisp -L $(PATH_SEPARATOR)$(srcdir)
# Extra flags to pass to the byte compiler.
BYTE_COMPILE_EXTRA_FLAGS =