[slime-cvs] CVS slime

[CVS User nsiivola]

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

Modified Files:
	ChangeLog swank.lisp 
Log Message:
fix &optional and &key handling in MACRO-INDENTATION

  * Don't count &optional.

  * Deal with &key and &rest identically.


--- /project/slime/cvsroot/slime/ChangeLog	2011/06/14 14:00:10	1.2199
+++ /project/slime/cvsroot/slime/ChangeLog	2011/06/14 14:01:32	1.2200
@@ -1,5 +1,8 @@
 2011-06-14  Nikodemus Siivola  <nikodemus at random-state.net>
 
+	* swank.lisp (macro-indentation): Fix handling of lambda-list
+	keywords other than &rest and &body.
+
 	* slime.el (slime-update-system-indentation): Remove stale specs
 	from common-lisp-system-indentation when new one arrives.
 
--- /project/slime/cvsroot/slime/swank.lisp	2011/06/10 16:13:28	1.745
+++ /project/slime/cvsroot/slime/swank.lisp	2011/06/14 14:01:32	1.746
@@ -3954,7 +3954,9 @@
                        ((eq '&body head)
                         '("&body"))
                        ((member head lambda-list-keywords)
-                        '("&rest" 1))
+                        (if (member head '(&rest &key))
+                            (list "&rest" n)
+                            (walk (cdr list) base)))
                        (t
                         (cons n (walk (cdr list) base))))))))
     (walk arglist t)))