[slime-cvs] CVS slime

CVS User heller heller at common-lisp.net
Thu Nov 3 18:31:32 UTC 2011


Update of /project/slime/cvsroot/slime
In directory tiger.common-lisp.net:/tmp/cvs-serv10007

Modified Files:
	ChangeLog swank.lisp 
Log Message:
* swank.lisp (close-connection): Be more careful with non-ascii.

--- /project/slime/cvsroot/slime/ChangeLog	2011/11/03 18:31:19	1.2221
+++ /project/slime/cvsroot/slime/ChangeLog	2011/11/03 18:31:31	1.2222
@@ -1,5 +1,9 @@
 2011-11-03  Helmut Eller  <heller at common-lisp.net>
 
+	* swank.lisp (close-connection): Be more careful with non-ascii.
+
+2011-11-03  Helmut Eller  <heller at common-lisp.net>
+
 	Remove dependecy on FLEXI-STREAMS for Lispworks.
 
 	* swank-lispworks.lisp (make-flexi-stream): Deleted.
--- /project/slime/cvsroot/slime/swank.lisp	2011/10/13 09:24:03	1.754
+++ /project/slime/cvsroot/slime/swank.lisp	2011/11/03 18:31:31	1.755
@@ -1073,8 +1073,9 @@
 
 (defun close-connection (c condition backtrace)
   (let ((*debugger-hook* nil))
-    (log-event "close-connection: ~a ...~%" condition)
-  (format *log-output* "~&;; swank:close-connection: ~A~%" condition)
+    (log-event "close-connection: ~a ...~%" condition))
+  (format *log-output* "~&;; swank:close-connection: ~A~%"
+          (escape-non-ascii (safe-condition-message condition)))
   (let ((cleanup (connection.cleanup c)))
     (when cleanup
       (funcall cleanup c)))
@@ -1094,15 +1095,15 @@
                         ;;  type: ~S~%~
                         ;;  encoding: ~A vs. ~A~%~
                         ;;  style: ~S dedicated: ~S]~%"
-            backtrace
+            (mapcar #'escape-non-ascii (mapcar #'frame-to-string backtrace))
             (escape-non-ascii (safe-condition-message condition) )
             (type-of condition)
             (connection.coding-system c)
             (connection.external-format c)
             (connection.communication-style c)
-            *use-dedicated-output-stream*)
-    (finish-output *log-output*))
-  (log-event "close-connection ~a ... done.~%" condition)))
+            *use-dedicated-output-stream*))
+  (finish-output *log-output*)
+  (log-event "close-connection ~a ... done.~%" condition))
 
 ;;;;;; Thread based communication
 





More information about the slime-cvs mailing list