[slime-cvs] CVS slime

[CVS User trittweiler]

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

Modified Files:
	ChangeLog swank.lisp 
Log Message:
	* swank.lisp (close-connection): Include initially passed
	coding-system in debugging output.


--- /project/slime/cvsroot/slime/ChangeLog	2010/03/08 09:47:12	1.2022
+++ /project/slime/cvsroot/slime/ChangeLog	2010/03/08 09:59:33	1.2023
@@ -1,5 +1,10 @@
 2010-03-08  Tobias C. Rittweiler <tcr at freebits.de>
 
+	* swank.lisp (close-connection): Include initially passed
+	coding-system in debugging output.
+
+2010-03-08  Tobias C. Rittweiler <tcr at freebits.de>
+
 	Make swank:connection-info include information about initially
 	passed coding-system, and the resulting external-format of the
 	socket. Debugging aid.
--- /project/slime/cvsroot/slime/swank.lisp	2010/03/08 09:47:12	1.696
+++ /project/slime/cvsroot/slime/swank.lisp	2010/03/08 09:59:33	1.697
@@ -302,7 +302,8 @@
   (print-unreadable-object (conn stream :type t :identity t)))
 
 (defun connection.external-format (connection)
-  (stream-external-format (connection.socket-io connection)))
+  (ignore-errors
+    (stream-external-format (connection.socket-io connection))))
 
 (defvar *connections* '()
   "List of all active connections, with the most recent at the front.")
@@ -946,11 +947,13 @@
                         ;; Connection to Emacs lost. [~%~
                         ;;  condition: ~A~%~
                         ;;  type: ~S~%~
-                        ;;  encoding: ~A style: ~S dedicated: ~S]~%"
+                        ;;  encoding: ~A vs. ~A~%~
+                        ;;  style: ~S dedicated: ~S]~%"
             backtrace
             (escape-non-ascii (safe-condition-message condition) )
             (type-of condition)
-            (ignore-errors (stream-external-format (connection.socket-io c)))
+            (connection.coding-system c)
+            (connection.external-format c)
             (connection.communication-style c)
             *use-dedicated-output-stream*)
     (finish-output *log-output*))