[slime-cvs] CVS slime

[CVS User sboukarev]

Update of /project/slime/cvsroot/slime
In directory cl-net:/tmp/cvs-serv26919

Modified Files:
	ChangeLog swank-sbcl.lisp 
Log Message:
* swank-sbcl.lisp (save-image): Fix save-lisp-and-die invocation.
Based on a patch by Anton Kovalenko.


--- /project/slime/cvsroot/slime/ChangeLog	2010/08/11 12:40:03	1.2122
+++ /project/slime/cvsroot/slime/ChangeLog	2010/08/12 12:09:45	1.2123
@@ -1,3 +1,8 @@
+2010-08-12  Stas Boukarev  <stassats at gmail.com>
+
+	* swank-sbcl.lisp (save-image): Fix save-lisp-and-die invocation.
+	Based on a patch by Anton Kovalenko.
+
 2010-08-11  Helmut Eller  <heller at common-lisp.net>
 
 	Bind *print-readably* to nil when printing the title.
--- /project/slime/cvsroot/slime/swank-sbcl.lisp	2010/07/21 13:40:32	1.272
+++ /project/slime/cvsroot/slime/swank-sbcl.lisp	2010/08/12 12:09:45	1.273
@@ -1551,10 +1551,9 @@
 (defimplementation save-image (filename &optional restart-function)
   (let ((pid (sb-posix:fork)))
     (cond ((= pid 0) 
-           (let ((args `(,filename 
-                         ,@(if restart-function
-                               `((:toplevel ,restart-function))))))
-             (apply #'sb-ext:save-lisp-and-die args)))
+           (apply #'sb-ext:save-lisp-and-die filename
+                  (when restart-function
+                    (list :toplevel restart-function))))
           (t
            (multiple-value-bind (rpid status) (sb-posix:waitpid pid 0)
              (assert (= pid rpid))