Patch: Do not expand file names
Eduardo Muñoz <[email protected]>
| Newsgroups | gmane.lisp.ilisp.devel |
|---|---|
| Organization | :noitazinagrO |
| Message-ID | <[email protected]> |
I don't know if the beahaviour of ilisp that I want is really correct, but here it goes. I'm using ilisp with an inferior lisp that is running on other machine, so the remote lisp (CMUCL) must load his own copy of ilisp files. The problem is that some ilisp init functions use 'expand-file-name' that obviously executes in the local machine and CMUCL is trying to load c:/usr/share/ilisp/ilisp-pkg.lisp (no good on Debian :) I propose to simply concatenate ilisp-*directory* and the file name in ilisp-compile-inits & friends as ilisp-*directory* should have a sane value after ilisp-init is called. -- Eduardo Muñoz | (prog () 10 (print "Hello world!") http://213.97.131.125/ | 20 (go 10))
ilisp-snd.el.diff
(text/x-patch, 1.1 KB)
Index: ilisp-snd.el
===================================================================
RCS file: /cvsroot/ilisp/ILISP/ilisp-snd.el,v
retrieving revision 1.19
diff -u -r1.19 ilisp-snd.el
--- ilisp-snd.el 2 Apr 2003 01:56:20 -0000 1.19
+++ ilisp-snd.el 10 May 2003 15:27:51 -0000
@@ -458,14 +458,12 @@
(dolist (file files)
(let ((load-file
- (let ((source
- (expand-file-name (cdr file)
- ilisp-*directory*))
+ (let ((source (concat ilisp-*directory* (cdr file)))
(binary
- (expand-file-name
+ (concat
+ ilisp-*directory*
(lisp-file-extension (cdr file)
- ilisp-binary-extension)
- ilisp-*directory*)))
+ ilisp-binary-extension))))
(if (file-newer-than-file-p binary source)
binary
source))))
ilisp-hi.el.diff
(text/x-patch, 553 B)
Index: ilisp-hi.el
===================================================================
RCS file: /cvsroot/ilisp/ILISP/ilisp-hi.el,v
retrieving revision 1.19
diff -u -r1.19 ilisp-hi.el
--- ilisp-hi.el 9 May 2003 14:44:02 -0000 1.19
+++ ilisp-hi.el 10 May 2003 15:37:47 -0000
@@ -281,7 +281,7 @@
(let ((files (ilisp-value 'ilisp-load-inits t)))
(dolist (f files)
(compile-file-lisp
- (expand-file-name (cdr f) ilisp-*directory*)
+ (concat ilisp-*directory* (cdr f))
(ilisp-value 'ilisp-init-binary-extension t)))))