[slime-cvs] CVS update: slime/swank-openmcl.lisp slime/swank.lisp

[Marco Baringer]

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

Modified Files:
	swank-openmcl.lisp swank.lisp 
Log Message:
Previous commit left out the files and only changed the ChangeLog, my bad.

Date: Sun Feb  8 10:37:33 2004
Author: mbaringer

Index: slime/swank-openmcl.lisp
diff -u slime/swank-openmcl.lisp:1.61 slime/swank-openmcl.lisp:1.62
--- slime/swank-openmcl.lisp:1.61	Sat Feb  7 14:30:05 2004
+++ slime/swank-openmcl.lisp	Sun Feb  8 10:37:33 2004
@@ -407,7 +407,7 @@
          (dolist (i info)
            (typecase (car i)
              ((member method)
-              (loop for (m . files) in (cdr i) 
+              (loop for (nil . files) in (cdr i) 
                     do (frob* files (list :function-name name))))
              ((member function variable method-combination)
               (frob* (cdr i) (list :function-name name)))


Index: slime/swank.lisp
diff -u slime/swank.lisp:1.117 slime/swank.lisp:1.118
--- slime/swank.lisp:1.117	Sat Feb  7 14:27:09 2004
+++ slime/swank.lisp	Sun Feb  8 10:37:33 2004
@@ -838,13 +838,25 @@
 	(makunbound name)
 	(prin1-to-string (eval form))))))
 
+(defvar *swank-pprint-circle* *print-circle*
+  "*PRINT-CIRCLE* is bound to this volue when pretty printing slime output.")
+
+(defvar *swank-pprint-escape* *print-escape*
+  "*PRINT-ESCAPE* is bound to this volue when pretty printing slime output.")
+
+(defvar *swank-pprint-level* *print-level*
+  "*PRINT-LEVEL* is bound to this volue when pretty printing slime output.")
+
+(defvar *swank-pprint-length* *print-length*
+  "*PRINT-LENGTH* is bound to this volue when pretty printing slime output.")
+
 (defun swank-pprint (list)
   "Bind some printer variables and pretty print each object in LIST."
   (let ((*print-pretty* t)
-        (*print-circle* t)
-        (*print-escape* t)
-        (*print-level* nil)
-        (*print-length* nil))
+        (*print-circle* *swank-pprint-circle*)
+        (*print-escape* *swank-pprint-escape*)
+        (*print-level* *swank-pprint-level*)
+        (*print-length* *swank-pprint-length*))
     (cond ((null list) "; No value")
           (t (with-output-to-string (*standard-output*)
                (dolist (o list)
@@ -945,10 +957,7 @@
 
 (defun apply-macro-expander (expander string)
   (declare (type function expander))
-  (let ((*print-pretty* t)
-	(*print-length* 20)
-	(*print-level* 20))
-    (to-string (funcall expander (from-string string)))))
+  (swank-pprint (list (funcall expander (from-string string)))))
 
 (defslimefun swank-macroexpand-1 (string)
   (apply-macro-expander #'macroexpand-1 string))