X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdescribe.lisp;h=35cd2657b5e9c568f6f61b87ea61515c0d667bbf;hb=422b88abf96f4842a3d0999cd3b80d96f5a153d6;hp=5033aa113f24d0d80d8eea6f9488d9d88b3407a2;hpb=27155202e7a3c0e997a4fad7ba2aa01fa1a2b7a9;p=sbcl.git

diff --git a/src/code/describe.lisp b/src/code/describe.lisp
index 5033aa1..35cd265 100644
--- a/src/code/describe.lisp
+++ b/src/code/describe.lisp
@@ -12,10 +12,6 @@
 
 (in-package "SB-IMPL") ;(SB-IMPL, not SB!IMPL, since we're built in warm load.)
 
-(defvar *describe-indentation-step* 3
-  #+sb-doc
-  "the number of spaces that sets off each line of a recursive description")
-
 (declaim (ftype (function (t stream)) describe-object))
 (defgeneric describe-object ((x t) stream))
 
@@ -23,10 +19,10 @@
   #+sb-doc
   "Print a description of the object X."
   (let ((stream (out-synonym-of stream-designator)))
+    (fresh-line stream)
     (pprint-logical-block (stream nil)
-      (fresh-line stream)
       (describe-object x stream)
-      (fresh-line stream)))
+      (pprint-newline :mandatory stream)))
   (values))
 
 ;;;; miscellaneous DESCRIBE-OBJECT methods
@@ -245,6 +241,7 @@
   (let* ((kind (info :variable :kind x))
 	 (wot (ecase kind
 		(:special "special variable")
+                (:macro "symbol macro")
 		(:constant "constant")
 		(:global "undefined variable")
 		(:alien nil))))
@@ -257,6 +254,9 @@
 		 (sb-alien::heap-alien-info-type info)))
 	(format s "~@<Its current value is ~3I~:_~S.~:>"
 		(eval x))))
+     ((eq kind :macro)
+      (let ((expansion (info :variable :macro-expansion x)))
+        (format s "~@:_It is a ~A with expansion ~S." wot expansion)))
      ((boundp x)
       (format s "~@:_~@<It is a ~A; its ~_value is ~S.~:>"
 	      wot (symbol-value x)))