dot/lisp-init.lisp: Add the `HOME:' logical-pathname host on ECL.

[profile] / dot / lisp-init.lisp

diff --git a/dot/lisp-init.lisp b/dot/lisp-init.lisp
index da50a6f2ab71ed6d7675024ed9fbb7402ba5bfdb..54df25f65a80c85edab9850e2df808ff073d1602 100644 (file)
--- a/dot/lisp-init.lisp
+++ b/dot/lisp-init.lisp
@@ -13,6 +13,24 @@ (setf *load-verbose* nil
 (setf ext:*gc-verbose* nil
       ext:*require-verbose* nil)
 
+#+ecl
+(let ((old-output *standard-output*)
+      (old-prompt si:*tpl-prompt-hook*))
+  ;; There doesn't seem to be a good way to do this, so we do it the bad
+  ;; way.  Since the herald is printed to `*standard-outout*', we set (not
+  ;; bind!) that to a bit bucket, and then arrange to restore it just before
+  ;; the first REPL prompt is written.
+  ;;
+  ;; One more awful part is that, having intercepted the prompt hook, I need
+  ;; to restore and invoke the old version, and there isn't a clean way to do
+  ;; this.
+  (when (<= (ext:argc) 1)
+    (setf *standard-output* (make-broadcast-stream)
+         si:*tpl-prompt-hook* (lambda ()
+                                (setf *standard-output* old-output
+                                      si:*tpl-prompt-hook* old-prompt)
+                                (si::tpl-prompt)))))
+
 ;; Obtain ASDF from somewhere.
 (require "asdf")
 
@@ -24,18 +42,21 @@ (setf ext:*batch-mode* t)
 #+sbcl
 (sb-ext:set-sbcl-source-location #p"/usr/share/sbcl-source/")
 
-;; Tell some Lisps about my home directory.
-#+(and unix (or sbcl clisp))
+;; Tell some Lisps about my home directory.  CMU CL already has a search list
+;; which does the same job.
+#+(and unix (or sbcl clisp ecl))
 (let* ((homestring (or #+sbcl (sb-ext:posix-getenv "HOME")
-                      #+clisp (ext:getenv "HOME")
-                      #+cmu (unix:unix-getenv "HOME")
+                      #+(or clisp ecl) (ext:getenv "HOME")
                       "/home/mdw"))
        (home (pathname (concatenate 'string homestring "/"))))
   (setf (logical-pathname-translations "HOME")
-       `(("HOME:**;*.*.*" ,(merge-pathnames "**/*.*" home nil)))
-       (logical-pathname-translations "CL")
-       '(("CL:SOURCE;**;*.*.*" #p"/usr/share/common-lisp/source/**/*.*")
-         ("CL:SYSTEMS;**;*.*.*" #p"/usr/share/common-lisp/systems/**/*.*"))))
+         `(("HOME:**;*.*.*" ,(merge-pathnames "**/*.*" home nil)))))
+(when (#.(car '(#+clisp ext:probe-directory
+               probe-file))
+        #p"/usr/share/common-lisp/")
+  (setf (logical-pathname-translations "CL")
+         '(("CL:SOURCE;**;*.*.*" #p"/usr/share/common-lisp/source/**/*.*")
+           ("CL:SYSTEMS;**;*.*.*" #p"/usr/share/common-lisp/systems/**/*.*"))))
 
 ;; Various fixings.
 #+clisp
@@ -66,7 +87,10 @@   (defvar *history-size* 1000)
   (push (lambda () (readline:write-history *history-file*))
        custom:*fini-hooks*))
 
-;; Shebang.
+;; Don't choke on shebang lines.  This isn't here so that we can run Lisp
+;; scripts like proper Unix programs: `cl-launch' or `runlisp' do that.  It's
+;; here so that we can `load' a script into a running Lisp without it choking
+;; on the shebang.
 (set-dispatch-macro-character
  #\# #\!
  (lambda (stream char arg)