From e6ce307c50e6413f1ba87a315e0f8beb1a8ddac8 Mon Sep 17 00:00:00 2001 From: Ralph Schleicher Date: Wed, 16 Mar 2011 01:00:58 +0100 Subject: [PATCH] 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. --- lisp/ChangeLog | 6 ++++++ lisp/info.el | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 29b47595eb6..5bd208ba3c8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-03-15 Ralph Schleicher + + * 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 * avoid.el (mouse-avoidance-mode, mouse-avoidance-nudge-dist) diff --git a/lisp/info.el b/lisp/info.el index c6e20f827c1..8fd0fc70096 100644 --- 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 -- 2.11.4.GIT