[slime-cvs] CVS slime/contrib

[CVS User nsiivola]

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

Modified Files:
	ChangeLog slime-cl-indent.el 
Log Message:
slime-indentation: better #+foo support

    (list bar #+foo (foo)
              #-foo (no-foo))

  instead of

    (list bar #+foo (foo)
          #-foo (no-foo))

  .


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2011/05/15 17:26:01	1.451
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2011/05/15 18:07:56	1.452
@@ -1,3 +1,8 @@
+2011-05-15  Nikodemus Siivola  <nikodemus at random-state.net>
+
+	* slime-cl-indent.el (common-lisp-indent-function-1): Better #+
+	support.
+
 2011-05-15  Didier Verna  <didier at xemacs.org>
 
 	* slime-cl-indent.el (test-lisp-indent): Make sure
--- /project/slime/cvsroot/slime/contrib/slime-cl-indent.el	2011/05/15 17:26:01	1.17
+++ /project/slime/cvsroot/slime/contrib/slime-cl-indent.el	2011/05/15 18:07:56	1.18
@@ -337,13 +337,12 @@
                   ((save-excursion
                      (goto-char indent-point)
                      (backward-sexp)
-                     (let ((xxx (buffer-substring-no-properties
-                                 (point) (+ (point) 3))))
-                       (and (eq ?\# (elt xxx 0))
-                            (or (member (elt xxx 1) '(?\+ ?\-))
-                                (and (eq ?\! (elt xxx 1))
-                                     (member (elt xxx 2) '(?\+ ?\-)))))))
-                   normal-indent)
+                     (let ((re "#!?\\(+\\|-\\)"))
+                       (if (or (looking-at re)
+                               (ignore-errors
+                                 (backward-sexp)
+                                 (looking-at re)))
+                         (setq calculated (current-column))))))
                   ((eq (char-after (1- containing-sexp)) ?\#)
                    ;; "#(...)"
                    (setq calculated (1+ sexp-column)))
@@ -1182,7 +1181,10 @@
    elseif (dsf)
      thenret x
      else (balbkj)
-          (sdf))")))
+          (sdf))"
+     "
+   (list foo #+foo (foo)
+             #-foo (no-foo))")))