[slime-cvs] CVS slime/contrib

[CVS User trittweiler]

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

Modified Files:
	swank-arglists.lisp ChangeLog 
Log Message:
	* swank-arglists.lisp (extract-cursor-marker): Fix typo.
	(autodoc): Do not try to display variable content for T and NIL.
	(interesting-variable-p): New helper.


--- /project/slime/cvsroot/slime/contrib/swank-arglists.lisp	2009/12/29 19:29:30	1.52
+++ /project/slime/cvsroot/slime/contrib/swank-arglists.lisp	2009/12/30 10:25:04	1.53
@@ -68,6 +68,11 @@
        (fboundp form)
        t))
 
+(defun interesting-variable-p (symbol)
+  (and symbol
+       (symbolp symbol)
+       (boundp symbol)
+       (not (memq symbol '(cl:t cl:nil)))))
 
 (defmacro multiple-value-or (&rest forms)
   (if (null forms)
@@ -1097,9 +1102,7 @@
       (with-buffer-syntax ()
         (multiple-value-bind (form arglist obj-at-cursor form-path)
             (find-subform-with-arglist (parse-raw-form raw-form))
-          (cond ((and obj-at-cursor
-                      (symbolp obj-at-cursor)
-                      (boundp obj-at-cursor))
+          (cond ((interesting-variable-p obj-at-cursor)
                  (print-variable-to-string obj-at-cursor))
                 (t
                  (with-available-arglist (arglist) arglist
@@ -1254,7 +1257,7 @@
                            (t
                             (multiple-value-bind (new-car new-last new-path)
                                 (grovel car last (cons 0 path))
-                              (when path
+                              (when new-path
                                 (return-from grovel
                                   (values (nreconc
                                            (cons new-car result-form) cdr)
@@ -1264,7 +1267,8 @@
                             (setq last car)
                             (incf (first path))))
                      finally
-                       (return (values (nreverse result-form) nil))))))
+                       (return-from grovel
+                         (values (nreverse result-form) nil nil))))))
     (grovel form nil (list 0))))
 
 (defgeneric extract-local-op-arglists (operator args)
--- /project/slime/cvsroot/slime/contrib/ChangeLog	2009/12/29 19:41:05	1.323
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2009/12/30 10:25:04	1.324
@@ -1,3 +1,9 @@
+2009-12-30  Tobias C. Rittweiler  <tcr at freebits.de>
+
+	* swank-arglists.lisp (extract-cursor-marker): Fix typo.
+	(autodoc): Do not try to display variable content for T and NIL.
+	(interesting-variable-p): New helper.
+
 2009-12-29  Tobias C. Rittweiler  <tcr at freebits.de>
 
 	* slime-autodoc.el (slime-compute-autodoc): Revert last change.