[slime-cvs] CVS slime/contrib

[CVS User nsiivola]

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

Modified Files:
	ChangeLog slime-cl-indent-test.txt slime-cl-indent.el 
Log Message:
slime-indentation: tweak COND indentation

  Indent

    (cond (symbol (foo)
                  (bar)))

  not

    (cond (symbol (foo)
           (bar)))

  -- should not change anything unless there is a form on the same
  line with a test that's a symbol.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2011/06/21 11:49:37	1.487
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2011/07/27 16:45:36	1.488
@@ -1,3 +1,8 @@
+2011-07-27  Nikodemus Siivola  <nikodemus at random-state.net>
+
+	* slime-cl-indent.el: Tweak COND indentation.
+	* slime-cl-indent-test.txt: Tests 48 and 49.
+
 2011-06-21  Nikodemus Siivola  <nikodemus at random-state.net>
 
 	* slime-cl-indent.el (lisp-loop-indent-forms-like-keywords): Fix type error.
--- /project/slime/cvsroot/slime/contrib/slime-cl-indent-test.txt	2011/06/14 13:59:31	1.9
+++ /project/slime/cvsroot/slime/contrib/slime-cl-indent-test.txt	2011/07/27 16:45:37	1.10
@@ -505,3 +505,30 @@
      :quux nil)
   ...)
 
+;;; Test: 48
+
+(cond
+  ((> x y) (foo)
+   ;; This isn't ideal -- I at least would align with (FOO here.
+   (bar) (quux)
+   (zot))
+  (qux (foo)
+       (bar)
+       (zot))
+  (zot
+   (foo)
+   (foo2))
+  (t (foo)
+     (bar)))
+
+;;; Test: 49
+
+(cond ((> x y) (foo)
+       ;; This isn't ideal -- I at least would align with (FOO here.
+       (bar))
+      (qux (foo)
+           (bar))
+      (zot
+       (foo))
+      (t (foo)
+         (bar)))
--- /project/slime/cvsroot/slime/contrib/slime-cl-indent.el	2011/06/21 11:49:37	1.48
+++ /project/slime/cvsroot/slime/contrib/slime-cl-indent.el	2011/07/27 16:45:37	1.49
@@ -1472,7 +1472,7 @@
            (etypecase   (as case))
            (ctypecase   (as case))
            (catch 1)
-           (cond        (&rest (&whole 2 &rest 1)))
+           (cond        (&rest (&whole 2 &rest nil)))
            ;; for DEFSTRUCT
            (:constructor (4 &lambda))
            (defvar      (4 2 2))