Merge branch 'master' of us:git/staging/profile

* 'master' of us:git/staging/profile:
  dot/lisp-init.lisp: Use `sb-ext:posix-getenv' instead of `sb-posix:getenv'.
  dot/lisp-init.lisp: Refactor setting of `HOME:'.

diff --git a/dot/lisp-init.lisp b/dot/lisp-init.lisp
index 7cccc8363907cf298759a5985adf07cc4e1526e5..146b25037cf4aa8fabbad230d6d1eab4c6c2874d 100644 (file)
--- a/dot/lisp-init.lisp
+++ b/dot/lisp-init.lisp
@@ -25,17 +25,15 @@ (setf *compile-verbose* nil)
 (sb-ext:set-sbcl-source-location #p"/usr/share/sbcl-source/")
 
 ;; Tell some Lisps about my home directory.
-#+sbcl (require :sb-posix)
 #+cmu (ext:clear-search-list "HOME")
 #+(and unix (or sbcl clisp cmu))
-(let ((#1=#:home (pathname (concatenate 'string
-                                       (or #+sbcl (sb-posix:getenv "HOME")
-                                           #+clisp (ext:getenv "HOME")
-                                           #+cmu (unix:unix-getenv "HOME")
-                                           "/home/mdw")
-                                       "/"))))
+(let* ((#1=#:homestring (or #+sbcl (sb-ext:posix-getenv "HOME")
+                           #+clisp (ext:getenv "HOME")
+                           #+cmu (unix:unix-getenv "HOME")
+                           "/home/mdw"))
+       (#2=#:home (pathname (concatenate 'string #1# "/"))))
   (setf (logical-pathname-translations "HOME")
-       `(("HOME:**;*.*.*" ,(merge-pathnames "**/*.*" #1# nil)))
+       `(("HOME:**;*.*.*" ,(merge-pathnames "**/*.*" #2# nil)))
        (logical-pathname-translations "CL")
        '(("CL:SOURCE;**;*.*.*" #p"/usr/share/common-lisp/source/**/*.*")
          ("CL:SYSTEMS;**;*.*.*" #p"/usr/share/common-lisp/systems/**/*.*"))))