diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-03-19 14:49:31 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-03-19 14:49:31 -0400 |
| commit | b14e3e21ec6702d27257a1400681fc36ee10282f (patch) | |
| tree | b57ce354a1ca3637a4cad3fe1fcc6f42bfc2efa5 /lisp/info.el | |
| parent | 4525ce3eb56a1f4b7c50eac9217854bbd170f660 (diff) | |
| parent | 20f5695598d3137257e24802479d003ea82eb5f9 (diff) | |
| download | emacs-b14e3e21ec6702d27257a1400681fc36ee10282f.tar.gz | |
Merge changes from emacs-23 branch
Diffstat (limited to 'lisp/info.el')
| -rw-r--r-- | lisp/info.el | 10 |
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 |