[slime-cvs] CVS slime/contrib

[CVS User heller]

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

Modified Files:
	ChangeLog swank-snapshot.lisp 
Log Message:
Fix slime-restore.

* swank-snapshot.lisp (swank-snapshot::resurrect): Adapted to
new MAKE-CONNECTION.

--- /project/slime/cvsroot/slime/contrib/ChangeLog	2010/07/29 08:05:22	1.405
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2010/08/13 07:25:15	1.406
@@ -1,3 +1,10 @@
+2010-08-13  Helmut Eller  <heller at common-lisp.net>
+
+	Fix slime-restore.
+
+	* swank-snapshot.lisp (swank-snapshot::resurrect): Adapted to
+	new MAKE-CONNECTION.
+
 2010-07-29  Stas Boukarev  <stassats at gmail.com>
 
 	* slime-c-p-c.el (slime-complete-form): Limit `looking-back' too.
--- /project/slime/cvsroot/slime/contrib/swank-snapshot.lisp	2009/12/22 09:31:15	1.1
+++ /project/slime/cvsroot/slime/contrib/swank-snapshot.lisp	2010/08/13 07:25:15	1.2
@@ -16,8 +16,10 @@
 	 (stream (swank::connection.socket-io conn))
 	 (clone (swank-backend:dup (swank-backend:socket-fd stream)))
 	 (style (swank::connection.communication-style conn))
+	 (coding (swank::connection.coding-system conn))
 	 (args (list "--swank-fd" (format nil "~d" clone)
-		     "--swank-style" (format nil "~s" style))))
+		     "--swank-style" (format nil "~s" style)
+		     "--swank-coding" (format nil "~s" coding))))
     (swank::close-connection conn nil nil)
     (swank-backend:exec-image image-file args)))
 
@@ -30,13 +32,13 @@
   (setq *connections* (delete old-connection *connections*))
   (format *error-output* "args: ~s~%" (command-line-args))
   (let* ((fd (read-command-line-arg "--swank-fd"))
-	 (style (read-command-line-arg "--swank-style")))
-    (format *error-output* "fd=~s style=~s~%" fd style)
-    (let ((connection (create-connection (make-fd-stream fd :default) style)))
-      (run-hook *new-connection-hook* connection)
-      (push connection *connections*)
-      (serve-requests connection)
-      (simple-repl))))
+	 (style (read-command-line-arg "--swank-style"))
+	 (coding (read-command-line-arg "--swank-coding"))
+	 (* (format *error-output* "fd=~s style=~s cs=~s~%" fd style coding))
+	 (stream (make-fd-stream fd (find-external-format-or-lose coding)))
+	 (connection (make-connection nil stream style  coding)))
+    (serve-requests connection)
+    (simple-repl)))
 
 (defun read-command-line-arg (name)
   (let* ((args (command-line-args))