[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100527: lisp/info.el: Fix bug#8258.

[Juanma Barranquero]

------------------------------------------------------------
revno: 100527
author: Ralph Schleicher <address@hidden>
committer: Juanma Barranquero <address@hidden>
branch nick: emacs-23
timestamp: Wed 2011-03-16 01:00:58 +0100
message:
  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.
modified:
  lisp/ChangeLog
  lisp/info.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-12 19:44:42 +0000
+++ b/lisp/ChangeLog    2011-03-16 00:00:58 +0000
@@ -1,3 +1,9 @@
+2011-03-15  Ralph Schleicher  <address@hidden>
+
+       * 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  <address@hidden>
 
        * avoid.el (mouse-avoidance-mode, mouse-avoidance-nudge-dist)

=== modified file 'lisp/info.el'
--- a/lisp/info.el      2011-01-02 23:50:46 +0000
+++ b/lisp/info.el      2011-03-16 00:00:58 +0000
@@ -588,15 +588,15 @@
 (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