[slime-cvs] CVS slime/contrib

[CVS User nsiivola]

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

Modified Files:
	ChangeLog slime-cl-indent-test.txt slime-cl-indent.el 
Log Message:
slime-indent: two patches from Tomohiro Matsuyama

  * slime-cl-indent.el (define-common-lisp-style): Fix handling
  of :documentation option, which accidentally threw out the docstring.
  (lisp-indent-lambda-list-keywords-regexp): Handle trailing
  &allow-other-keys correctly.

  * slime-cl-indent-test.txt: Tests 50-53.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2011/10/07 12:50:20	1.499
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2011/10/29 11:15:15	1.500
@@ -1,3 +1,14 @@
+2011-10-29  Nikodemus Siivola  <nikodemus at random-state.net>
+
+	Two patches by Tomohiro Matsuyama <tomo at cx4a.org>.
+
+	* slime-cl-indent.el (define-common-lisp-style): Fix handling
+	of :documentation option, which accidentally threw out the docstring.
+	(lisp-indent-lambda-list-keywords-regexp): Handle trailing
+	&allow-other-keys correctly.
+
+	* slime-cl-indent-test.txt: Tests 50-53.
+
 2011-10-07  Stas Boukarev  <stassats at gmail.com>
 
 	* slime-repl.el (slime-repl-clear-output): Fix clearing output
--- /project/slime/cvsroot/slime/contrib/slime-cl-indent-test.txt	2011/07/27 16:45:37	1.10
+++ /project/slime/cvsroot/slime/contrib/slime-cl-indent-test.txt	2011/10/29 11:15:15	1.11
@@ -532,3 +532,51 @@
        (foo))
       (t (foo)
          (bar)))
+
+;;; Test: 50
+;;
+;; lisp-lambda-list-keyword-parameter-alignment: nil
+;; lisp-lambda-list-keyword-alignment: nil
+
+(defun foo (x &optional opt1
+                opt2
+            &rest rest
+            &allow-other-keys)
+  (list opt1 opt2
+        rest))
+
+;;; Test: 51
+;;
+;; lisp-lambda-list-keyword-parameter-alignment: t
+;; lisp-lambda-list-keyword-alignment: nil
+
+(defun foo (x &optional opt1
+                        opt2
+            &rest rest
+            &allow-other-keys)
+  (list opt1 opt2
+        rest))
+
+;;; Test: 52
+;;
+;; lisp-lambda-list-keyword-parameter-alignment: nil
+;; lisp-lambda-list-keyword-alignment: t
+
+(defun foo (x &optional opt1
+                opt2
+              &rest rest
+              &allow-other-keys)
+  (list opt1 opt2
+        rest))
+
+;;; Test: 53
+;;
+;; lisp-lambda-list-keyword-parameter-alignment: t
+;; lisp-lambda-list-keyword-alignment: t
+
+(defun foo (x &optional opt1
+                        opt2
+              &rest rest
+              &allow-other-keys)
+  (list opt1 opt2
+        rest))
--- /project/slime/cvsroot/slime/contrib/slime-cl-indent.el	2011/07/27 16:45:37	1.49
+++ /project/slime/cvsroot/slime/contrib/slime-cl-indent.el	2011/10/29 11:15:15	1.50
@@ -402,8 +402,8 @@
   option should cope with that.
 "
   (when (consp documentation)
-    (setq documentation nil
-          options (cons documentation options)))
+    (setq options (cons documentation options)
+          documentation nil))
   `(common-lisp-add-style ,name
                           ',(cadr (assoc :inherit options))
                           ',(cdr (assoc :variables options))
@@ -928,7 +928,7 @@
 (defvar lisp-indent-lambda-list-keywords-regexp
   "&\\(\
 optional\\|rest\\|key\\|allow-other-keys\\|aux\\|whole\\|body\\|environment\\|more\
-\\)\\([ \t]\\|$\\)"
+\\)\\_>"
   "Regular expression matching lambda-list keywords.")
 
 (defun lisp-indent-lambda-list