/[cmucl]/src/code/filesys.lisp
ViewVC logotype

Diff of /src/code/filesys.lisp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.21 by wlott, Wed Dec 18 11:42:09 1991 UTC revision 1.22 by wlott, Wed Dec 18 23:15:38 1991 UTC
# Line 763  Line 763 
763        (mapcar #'(lambda (name)        (mapcar #'(lambda (name)
764                    (if (and check-for-subdirs                    (if (and check-for-subdirs
765                             (eq (mach:unix-file-kind name) :directory))                             (eq (mach:unix-file-kind name) :directory))
766                        (pathname (concatenate 'string name "/"))                        (truename (concatenate 'string name "/"))
767                        (pathname name)))                        (truename name)))
768                (sort (delete-duplicates results :test #'string=) #'string<)))))                (sort (delete-duplicates results :test #'string=) #'string<)))))
769    
770    
# Line 987  Line 987 
987  ;;;  ;;;
988  (defun complete-file (pathname &key (defaults *default-pathname-defaults*)  (defun complete-file (pathname &key (defaults *default-pathname-defaults*)
989                                 ignore-types)                                 ignore-types)
990    (let ((files    (let ((files (directory (complete-file-directory-arg pathname defaults)
991           (directory (complete-file-directory-arg pathname defaults)                            :check-for-subdirs nil)))
                     :check-for-subdirs nil)))  
992      (cond ((null files)      (cond ((null files)
993             (values nil nil))             (values nil nil))
994            ((null (cdr files))            ((null (cdr files))
# Line 1029  Line 1028 
1028  ;;; COMPLETE-FILE-DIRECTORY-ARG -- Internal.  ;;; COMPLETE-FILE-DIRECTORY-ARG -- Internal.
1029  ;;;  ;;;
1030  (defun complete-file-directory-arg (pathname defaults)  (defun complete-file-directory-arg (pathname defaults)
1031    (let* ((pathname (merge-pathnames pathname defaults))    (let* ((pathname (merge-pathnames pathname (directory-namestring defaults)))
1032           (type (pathname-type pathname)))           (type (pathname-type pathname)))
1033      (flet ((append-multi-char-wild (thing)      (flet ((append-multi-char-wild (thing)
1034               (etypecase thing               (etypecase thing

Legend:
Removed from v.1.21  
changed lines
  Added in v.1.22

  ViewVC Help
Powered by ViewVC 1.1.5