Changeset 14429

Timestamp:

Nov 12, 2010, 7:51:15 PM (14 years ago)

Author:

Shannon Spires

Message:

Be slightly less stupid in #'pathname-for-namestring-fragment. Tolerate strings surrounded by \" or beginning with #P. Automatically add *.lisp-pathname* if all else fails.

File:

• trunk/source/cocoa-ide/cocoa-editor.lisp (modified) (1 diff)

trunk/source/cocoa-ide/cocoa-editor.lisp

@@ -1802 +1802 @@
   "Return a pathname that STRING might designate."
   ;; We could get fancy here, but for now just be stupid.
-  (let ((pathname (ignore-errors (probe-file string))))
+  (let* ((rfs (ignore-errors (read-from-string string nil nil)))
+         (pathname (or (ignore-errors (probe-file string))
+                       (ignore-errors (probe-file rfs))
+                       (ignore-errors (probe-file (merge-pathnames *.lisp-pathname* string)))
+                       (ignore-errors (probe-file (merge-pathnames *.lisp-pathname* rfs))))))
     (if (and (pathnamep pathname)
              (not (directory-pathname-p pathname)))