Merge branch 'master' of us:git/staging/profile
authorMark Wooding <mdw@distorted.org.uk>
Sun, 20 Sep 2015 13:50:49 +0000 (14:50 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sun, 20 Sep 2015 13:50:49 +0000 (14:50 +0100)
* '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:'.

1  2 
dot/lisp-init.lisp

  
  ;; Tell SBCL where to find its source source.
  #+sbcl
 -(let ((#1=#:sbcl-src #p"/usr/share/sbcl-source/"))
 -  (flet ((#2=#:sbcl-dir (#3=#:p)
 -         (merge-pathnames #3# #1#)))
 -    (setf (logical-pathname-translations "SYS")
 -        `(("SYS:SRC;**;*.*.*" ,(#2# "src/**/*.*"))
 -          ("SYS:CONTRIB;**;*.*.*" ,(#2# "contrib/**/*.*"))))))
 +(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/**/*.*"))))