lisp/info.el: Fix bug#8258.

* info (info-initialize): Replace all uses of `:' with path-separator for
  compatibility with non-Unix systems.  Cache quoting of path-separator.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 29b4759..5bd208b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-15  Ralph Schleicher  <rs@ralph-schleicher.de>
+
+       * info.el (info-initialize): Replace all uses of `:' with
+       path-separator for compatibility with non-Unix systems.
+       Cache quoting of path-separator.  (Bug#8258)
+
 2011-03-12  Juanma Barranquero  <lekktu@gmail.com>
 
        * avoid.el (mouse-avoidance-mode, mouse-avoidance-nudge-dist)

diff --git a/lisp/info.el b/lisp/info.el
index c6e20f8..8fd0fc7 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -588,15 +588,15 @@ in `Info-file-supports-index-cookies-list'."
 (defun info-initialize ()
   "Initialize `Info-directory-list', if that hasn't been done yet."
   (unless Info-directory-list
-    (let ((path (getenv "INFOPATH")))
+    (let ((path (getenv "INFOPATH"))
+         (sep (regexp-quote path-separator)))
       (setq Info-directory-list
            (prune-directory-list
             (if path
-                (if (string-match ":\\'" path)
-                    (append (split-string (substring path 0 -1)
-                                          (regexp-quote path-separator))
+                (if (string-match-p (concat sep "\\'") path)
+                    (append (split-string (substring path 0 -1) sep)
                             (Info-default-dirs))
-                  (split-string path (regexp-quote path-separator)))
+                  (split-string path sep))
               (Info-default-dirs)))))))
 
 ;;;###autoload