Merge from trunk

1 files changed, 5 insertions, 5 deletions

diff --git a/lisp/info.el b/lisp/info.el
index bc2062e72b2..fb753659737 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -594,15 +594,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