[slime-cvs] CVS slime

[CVS User heller]

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

Modified Files:
	ChangeLog swank.lisp 
Log Message:
* swank.lisp (to-line): Increase default limit to 512.
(frame-locals-for-emacs): Let *print-right-margin* override
default line width.

--- /project/slime/cvsroot/slime/ChangeLog	2011/11/27 21:47:14	1.2250
+++ /project/slime/cvsroot/slime/ChangeLog	2011/11/29 19:50:15	1.2251
@@ -1,3 +1,9 @@
+2011-11-29  Helmut Eller  <heller at common-lisp.net>
+
+	* swank.lisp (to-line): Increase default limit to 512.
+	(frame-locals-for-emacs): Let *print-right-margin* override
+	default line width.
+
 2011-11-27  Helmut Eller  <heller at common-lisp.net>
 
 	* swank.lisp (create-server): Add a :backlog argument.
@@ -21,6 +27,7 @@
 	stream if external-format is non-nil.
 
 2011-11-27  Helmut Eller  <heller at common-lisp.net>
+
 	* swank.lisp (create-server): Remove coding-system argument.
 	([defstruct] connection): Remove coding-system slot.
 	(connection.external-format, *coding-system*): Deleted.
--- /project/slime/cvsroot/slime/swank.lisp	2011/11/27 21:47:15	1.764
+++ /project/slime/cvsroot/slime/swank.lisp	2011/11/29 19:50:16	1.765
@@ -2252,11 +2252,12 @@
             (with-string-stream (,var :length ,length)
               . ,body)))))
 
-(defun to-line  (object &optional (width 75))
+(defun to-line (object &optional width)
   "Print OBJECT to a single line. Return the string."
-  (without-printing-errors (:object object :stream nil)
-    (with-string-stream (stream :length width)
-      (write object :stream stream :right-margin width :lines 1))))
+  (let ((width (or width 512)))
+    (without-printing-errors (:object object :stream nil)
+      (with-string-stream (stream :length width)
+        (write object :stream stream :right-margin width :lines 1)))))
 
 (defun escape-string (string stream &key length (map '((#\" . "\\\"")
                                                        (#\\ . "\\\\"))))
@@ -2674,11 +2675,11 @@
 
 (defun frame-locals-for-emacs (index)
   (with-bindings *backtrace-printer-bindings*
-    (loop for var in (frame-locals index)
-          collect (destructuring-bind (&key name id value) var
-                    (list :name (prin1-to-string name) 
-                          :id id
-                          :value (to-line value))))))
+    (loop for var in (frame-locals index) collect 
+          (destructuring-bind (&key name id value) var
+            (list :name (prin1-to-string name)
+                  :id id
+                  :value (to-line value *print-right-margin*))))))
 
 (defslimefun sldb-disassemble (index)
   (with-output-to-string (*standard-output*)