Commit 85ee6da1 authored by wlott's avatar wlott
Browse files

Allow search-lists to expand into relative pathnames by quietly merging

them with ``default:''.
parent 6d8b9117
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;; ;;;
(ext:file-comment (ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pathname.lisp,v 1.6 1992/01/16 18:38:51 wlott Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pathname.lisp,v 1.7 1992/02/19 01:50:17 wlott Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
...@@ -969,11 +969,13 @@ ...@@ -969,11 +969,13 @@
a name, type, or ~%version specified:~% ~S" a name, type, or ~%version specified:~% ~S"
pathname)) pathname))
(let ((directory (pathname-directory pathname))) (let ((directory (pathname-directory pathname)))
(unless (eq (car directory) :absolute) (let ((expansion
(error "Search-lists cannot expand into relative ~ (if directory
pathnames:~% ~S" (ecase (car directory)
pathname)) (:absolute (cdr directory))
(let ((expansion (cdr directory))) (:relative (cons (intern-search-list "default")
(cdr directory))))
(list (intern-search-list "default")))))
(check (car expansion) nil) (check (car expansion) nil)
expansion))))) expansion)))))
(setf (search-list-expansions search-list) (setf (search-list-expansions search-list)
......
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