X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/6c3c2dd3e236da72ce43b923e4eeac7d33eb5cbd..df28942de116d6b194f0f2aee3cf20450d5e44aa:/src/module-impl.lisp

diff --git a/src/module-impl.lisp b/src/module-impl.lisp
index 268f4bc..1eb2531 100644
--- a/src/module-impl.lisp
+++ b/src/module-impl.lisp
@@ -195,7 +195,10 @@
 		 (prin1 (subseq text 0 37) stream)
 		 (write-string "..." stream))))
 	(output-c-excursion stream location
-			    (lambda (stream) (write-string text stream))))))
+			    (lambda (stream)
+			      (awhen (file-location-column location)
+				(dotimes (i it) (write-char #\space stream)))
+			      (write-string text stream))))))
 
 (defmethod make-load-form ((fragment c-fragment) &optional environment)
   (make-load-form-saving-slots fragment :environment environment))
@@ -228,10 +231,10 @@
    See `find-file' for the grubby details.")
 
 (export 'find-file)
-(defun find-file (scanner name what thunk)
+(defun find-file (home name what thunk)
   "Find a file called NAME on the module search path, and call THUNK on it.
 
-   The file is searched for relative to the SCANNER's current file, and also
+   The file is searched for relative to the HOME file or directory, and also
    in the directories mentioned in the `*module-dirs*' list.  If the file is
    found, then THUNK is invoked with two arguments: the name we used to find
    it (which might be relative to the starting directory) and the truename
@@ -245,8 +248,7 @@
    THUNK is not invoked with any additional handlers defined."
 
   (handler-case
-      (dolist (dir (cons (pathname (scanner-filename scanner)) *module-dirs*)
-	       (values nil nil))
+      (dolist (dir (cons home *module-dirs*) (values nil nil))
 	(let* ((path (merge-pathnames name dir))
 	       (probe (probe-file path)))
 	  (when probe