[Emacs-diffs] trunk r115164: Use path-separator with -L, rather than just :

[Glenn Morris]

------------------------------------------------------------
revno: 115164
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-11-20 19:21:50 -0500
message:
  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.
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/cmdargs.texi         
cmdargs.texi-20091113204419-o5vbwnq5f7feedwu-6238
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/startup.el                startup.el-20091113204419-o5vbwnq5f7feedwu-260
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/Makefile.in     makefile.in-20110112160650-056hnl9qhpjvjicy-6

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2013-11-04 01:36:14 +0000
+++ b/doc/emacs/ChangeLog       2013-11-21 00:21:50 +0000
@@ -1,3 +1,7 @@
+2013-11-21  Glenn Morris  <address@hidden>
+
+       * cmdargs.texi (Action Arguments): Use path-separator with -L.
+
 2013-11-04  Glenn Morris  <address@hidden>
 
        * cmdargs.texi (Action Arguments): Mention that `-L :...' appends.

=== modified file 'doc/emacs/cmdargs.texi'
--- a/doc/emacs/cmdargs.texi    2013-11-18 22:53:47 +0000
+++ b/doc/emacs/cmdargs.texi    2013-11-21 00:21:50 +0000
@@ -142,6 +142,8 @@
 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

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2013-11-20 02:44:38 +0000
+++ b/etc/NEWS  2013-11-21 00:21:50 +0000
@@ -64,7 +64,8 @@
 
 +++
 ** 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

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-20 21:01:00 +0000
+++ b/lisp/ChangeLog    2013-11-21 00:21:50 +0000
@@ -1,3 +1,7 @@
+2013-11-21  Glenn Morris  <address@hidden>
+
+       * startup.el (command-line-1): Use path-separator with -L.
+
 2013-11-20  Teodor Zlatanov  <address@hidden>
 
        * emacs-lisp/package.el (describe-package-1): Add package archive

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2013-11-05 16:18:00 +0000
+++ b/lisp/startup.el   2013-11-21 00:21:50 +0000
@@ -2219,7 +2219,7 @@
                   ;; -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))

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2013-11-18 18:56:42 +0000
+++ b/test/ChangeLog    2013-11-21 00:21:50 +0000
@@ -1,3 +1,8 @@
+2013-11-21  Glenn Morris  <address@hidden>
+
+       * automated/Makefile.in (PATH_SEPARATOR): New, set by configure.
+       (EMACSOPT): Use PATH_SEPARATOR.
+
 2013-11-18  Paul Eggert  <address@hidden>
 
        Improve API of recently-added bool vector functions (Bug#15912).

=== modified file 'test/automated/Makefile.in'
--- a/test/automated/Makefile.in        2013-11-06 17:56:48 +0000
+++ b/test/automated/Makefile.in        2013-11-21 00:21:50 +0000
@@ -22,13 +22,17 @@
 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 =