Commit 0b97c030 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

merge trunk

parents 85a43e2e 1667e065
2012-09-16 Chong Yidong <cyd@gnu.org> 2012-09-16 Chong Yidong <cyd@gnu.org>
   
* files.el (parse-colon-path): Use split-string (Bug#12351).
* window.el (special-display-popup-frame): Doc fix (Bug#8853). * window.el (special-display-popup-frame): Doc fix (Bug#8853).
(display-buffer-function): Mark as obsolete. (display-buffer-function): Mark as obsolete.
   
......
...@@ -658,22 +658,13 @@ Not actually set up until the first time you use it.") ...@@ -658,22 +658,13 @@ Not actually set up until the first time you use it.")
(defun parse-colon-path (search-path) (defun parse-colon-path (search-path)
"Explode a search path into a list of directory names. "Explode a search path into a list of directory names.
Directories are separated by occurrences of `path-separator' Directories are separated by `path-separator' (which is colon in
\(which is colon in GNU and GNU-like systems)." GNU and Unix systems). Substitute environment variables into the
;; We could use split-string here. resulting list of directory names."
(and search-path (when (stringp search-path)
(let (cd-list (cd-start 0) cd-colon) (mapcar (lambda (f)
(setq search-path (concat search-path path-separator)) (substitute-in-file-name (file-name-as-directory f)))
(while (setq cd-colon (string-match path-separator search-path cd-start)) (split-string search-path path-separator t))))
(setq cd-list
(nconc cd-list
(list (if (= cd-start cd-colon)
nil
(substitute-in-file-name
(file-name-as-directory
(substring search-path cd-start cd-colon)))))))
(setq cd-start (+ cd-colon 1)))
cd-list)))
(defun cd-absolute (dir) (defun cd-absolute (dir)
"Change current directory to given absolute file name DIR." "Change current directory to given absolute file name DIR."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment