[slime-cvs] CVS slime/contrib

[CVS User trittweiler]

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

Modified Files:
	swank-arglists.lisp ChangeLog 
Log Message:
	* swank-arglists.lisp (extract-cursor-marker): Make sure to
	recurse only if the form, to be recursed into, is a cons.

	Reported by Johannes Grødem.


--- /project/slime/cvsroot/slime/contrib/swank-arglists.lisp	2010/01/06 14:13:48	1.55
+++ /project/slime/cvsroot/slime/contrib/swank-arglists.lisp	2010/01/06 14:40:20	1.56
@@ -1254,18 +1254,18 @@
                               (values (nreconc result-form cdr)
                                       last
                                       (nreverse path))))
-                           (t
+                           ((consp car)
                             (multiple-value-bind (new-car new-last new-path)
                                 (grovel car last (cons 0 path))
-                              (when new-path
+                              (when new-path ; CAR contained cursor-marker?
                                 (return-from grovel
                                   (values (nreconc
                                            (cons new-car result-form) cdr)
                                           new-last
-                                          new-path))))
-                            (push car result-form)
-                            (setq last car)
-                            (incf (first path))))
+                                          new-path))))))
+                     (push car result-form)
+                     (setq last car)
+                     (incf (first path))
                      finally
                        (return-from grovel
                          (values (nreverse result-form) nil nil))))))
--- /project/slime/cvsroot/slime/contrib/ChangeLog	2010/01/06 14:13:48	1.334
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2010/01/06 14:40:20	1.335
@@ -1,5 +1,12 @@
 2010-01-06  Tobias C. Rittweiler  <tcr at freebits.de>
 
+	* swank-arglists.lisp (extract-cursor-marker): Make sure to
+	recurse only if the form, to be recursed into, is a cons.
+
+	Reported by Johannes Grødem.
+
+2010-01-06  Tobias C. Rittweiler  <tcr at freebits.de>
+
 	* swank-arglists.lisp (arglist-dispatch ['declare]): Normalize
 	`vars' to `variables'.
 	(arglist-for-type-declaration): Ditto.