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.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 7f051e751e53b70486d6906ddc37daed669f8811..229929d132dc07eaa58e286792eac621ff9be0b2 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -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.

diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 143e03cde63108550593faf83553ef0d9369d6ba..92861c443f1a0c85723b8d039d90b97efedf1da8 100644 (file)
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -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

diff --git a/etc/NEWS b/etc/NEWS
index 33103f727754422c7fc08b999e0453293db1a36f..97ae6c79d201e2bd3a898a8a2540b18ed46a2d8e 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -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').
 
 \f
 * Changes in Emacs 24.4

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 93b51580a236d2346d442302af9b821fe656844b..d24ab3bc8370178b3801486f4df6d847486f0d73 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/startup.el b/lisp/startup.el
index 2394c73b879cdc08861ead5400651c5a159eb947..88ec1f359eb4c7d09bcfaa96eec1bfe74cc901ec 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -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))

diff --git a/test/ChangeLog b/test/ChangeLog
index 35a168ce0c43584bb277b8118e07db7962a125ce..601c8d3bb82d71a24132e89024da3ca7dcff1bed 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -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).

diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index 617768995f1694417ee6eabf250c154a4c9eff0d..ced75f0b5836f69f480acf6ab2a2f87b8227b87a 100644 (file)
--- a/test/automated/Makefile.in
+++ b/test/automated/Makefile.in
@@ -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 =