[slime-cvs] CVS slime/contrib

[CVS User nsiivola]

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

Modified Files:
	ChangeLog slime-cl-indent.el 
Log Message:
slime-indentation: small fixes

 * Two defcustoms had wrong types.

 * Make the common-lisp-style-default offer a dropdown menu in the
   customization group.

 * "sbcl" style used :as instead of as, and missed defmacro-mundanely
   and define-source-transform.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2011/06/16 08:29:17	1.486
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2011/06/21 11:49:37	1.487
@@ -1,3 +1,11 @@
+2011-06-21  Nikodemus Siivola  <nikodemus at random-state.net>
+
+	* slime-cl-indent.el (lisp-loop-indent-forms-like-keywords): Fix type error.
+	(common-lisp-style-default): Fix type error, move to after styles have been
+	defined so as to be able to offer a menu for picking the predefined styles.
+	("sbcl"): Oops! It's (as ...) not (:as ...). Also add couple of missing defining
+	forms.
+
 2011-06-16  Nikodemus Siivola  <nikodemus at random-state.net>
 
 	* swank-indentation.lisp (macro-indentation): More complex
--- /project/slime/cvsroot/slime/contrib/slime-cl-indent.el	2011/06/14 13:59:31	1.47
+++ /project/slime/cvsroot/slime/contrib/slime-cl-indent.el	2011/06/21 11:49:37	1.48
@@ -82,7 +82,7 @@
   "Whether or not to indent loop subforms just like
 loop keywords. Only matters when `lisp-loop-indent-subclauses'
 is nil."
-  :type 'integer
+  :type 'boolean
   :group 'lisp-indent)
 
 (defcustom lisp-align-keywords-in-calls t
@@ -225,12 +225,6 @@
 buffer has no style specified, but `common-lisp-style-default' is set, that
 style is used instead. Use `define-common-lisp-style' to define new styles.")
 
-(defcustom common-lisp-style-default nil
-    "Name of the Common Lisp indentation style to use in lisp-mode buffers if
-none has been specified."
-  :type 'string
-  :group 'lisp-indent)
-
 (make-variable-buffer-local 'common-lisp-style)
 (set-default 'common-lisp-style nil)
 
@@ -481,12 +475,23 @@
    (comment-fill-column nil)
    (fill-column 78))
   (:indentation
-   (def!constant       (:as defconstant))
-   (def!macro          (:as defmacro))
-   (def!method         (:as defmethod))
-   (def!struct         (:as defstruct))
-   (def!type           (:as deftype))
-   (defmacro-mundanely (:as defmacro))))
+   (def!constant       (as defconstant))
+   (def!macro          (as defmacro))
+   (def!method         (as defmethod))
+   (def!struct         (as defstruct))
+   (def!type           (as deftype))
+   (defmacro-mundanely (as defmacro))
+   (define-source-transform (as defun))))
+
+(defcustom common-lisp-style-default nil
+    "Name of the Common Lisp indentation style to use in lisp-mode buffers if
+none has been specified."
+  :type `(choice (const :tag "None" nil)
+                 ,@(mapcar (lambda (spec)
+                             `(const :tag ,(car spec) ,(car spec)))
+                           (common-lisp-style-names))
+                 (string :tag "Other"))
+  :group 'lisp-indent)
 
 ;;;; The indentation specs are stored at three levels. In order of priority:
 ;;;;