[slime-cvs] CVS slime/contrib

[CVS User nsiivola]

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

Modified Files:
	ChangeLog slime-cl-indent.el 
Log Message:
slime-indentation: fix indentation inside ,(...) and ,@(...)

  For some unfathomable reason indetation logic was explicitly turned
  off for these -- but since these sections are evaluated, they should
  clearly be indented as code.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2011/05/15 17:09:16	1.438
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2011/05/15 17:10:13	1.439
@@ -1,5 +1,12 @@
 2011-05-10  Nikodemus Siivola  <nikodemus at random-state.net>
 
+	* slime-cl-indent.el (common-lisp-indent-function-1): Remove
+	bogus special casing of ,(...) and ,@(...). Even if backquote
+	was being indented as data, the escaped forms are evaluated,
+	and hence should be indented as lisp code.
+
+2011-05-10  Nikodemus Siivola  <nikodemus at random-state.net>
+
 	* slime-cl-indent.el (lisp-indent-259): Don't throw to exit with
 	normal-indent if processing a tail that isn't a cons. Doing that
 	breaks (... &rest foo) specs.
--- /project/slime/cvsroot/slime/contrib/slime-cl-indent.el	2011/05/15 17:09:16	1.4
+++ /project/slime/cvsroot/slime/contrib/slime-cl-indent.el	2011/05/15 17:10:13	1.5
@@ -333,11 +333,6 @@
                         (not (eq (char-after (- containing-sexp 2)) ?\#)))
                    ;; No indentation for "'(...)" elements
                    (setq calculated (1+ sexp-column)))
-                  ((or (eq (char-after (1- containing-sexp)) ?\,)
-                       (and (eq (char-after (1- containing-sexp)) ?\@)
-                            (eq (char-after (- containing-sexp 2)) ?\,)))
-                   ;; ",(...)" or ",@(...)"
-                   (setq calculated normal-indent))
                   ((eq (char-after (1- containing-sexp)) ?\#)
                    ;; "#(...)"
                    (setq calculated (1+ sexp-column)))