[slime-cvs] CVS slime/contrib

[CVS User nsiivola]

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

Modified Files:
	ChangeLog slime-cl-indent.el 
Log Message:
slime-indentation: don't take `default' for a tentative defun

  cl-indent.el assumed that anything starting with `def' is a defining
  form, which is mostly a good assumption, but breaks horribly with
  `default', which isn't even all that rare.

  This patch fixes indentation of defclass :default-initargs, among
  other things.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2011/05/15 17:07:04	1.436
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2011/05/15 17:07:47	1.437
@@ -1,5 +1,11 @@
 2011-05-10  Nikodemus Siivola  <nikodemus at random-state.net>
 
+	* slime-cl-indent.el (common-lisp-indent-function-1): Don't take
+	`default' for a tentative defun, unlike anything else starting
+	with `def'.
+
+2011-05-10  Nikodemus Siivola  <nikodemus at random-state.net>
+
 	slime-indentation: indentation improvements on defmethod and
 	lambda-lists for cl-indent.el by Didier Verna, from emacs-devel.
 
--- /project/slime/cvsroot/slime/contrib/slime-cl-indent.el	2011/05/15 17:07:04	1.2
+++ /project/slime/cvsroot/slime/contrib/slime-cl-indent.el	2011/05/15 17:07:47	1.3
@@ -313,8 +313,8 @@
                   ((null method)
                    (when (null (cdr path))
 		     ;; (package prefix was stripped off above)
-		     (cond ((string-match "\\`def"
-					  function)
+		     (cond ((and (string-match "\\`def" function)
+                                 (not (string-match "\\`default" function)))
 			    (setq tentative-defun t))
 			   ((string-match
                              (eval-when-compile