From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 20 Sep 2015 13:50:49 +0000 (+0100)
Subject: Merge branch 'master' of us:git/staging/profile
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/c94913f2042b9de6f7ea3dc53dd8a8b778e21743

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:'.
---

c94913f2042b9de6f7ea3dc53dd8a8b778e21743
diff --cc dot/lisp-init.lisp
index 7cccc83,ed6acd1..146b250
--- a/dot/lisp-init.lisp
+++ b/dot/lisp-init.lisp
@@@ -22,20 -22,23 +22,18 @@@
  
  ;; 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/**/*.*"))))