diff lisp/emacs-lisp/cl-indent.el @ 90645:7eeafaaa9eab

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 476-489) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 153-160) - Merge from emacs--devo--0 - Update from CVS Revision: [e-mail]/emacs--unicode--0--patch-127

--- a/lisp/emacs-lisp/cl-indent.el	Mon Oct 30 06:52:47 2006 +0000
+++ b/lisp/emacs-lisp/cl-indent.el	Mon Oct 30 08:54:41 2006 +0000
@@ -373,14 +373,16 @@
                      ;; Too few elements in pattern.
                      (throw 'exit normal-indent)))
                 ((eq tem 'nil)
-                 (throw 'exit (list normal-indent containing-form-start)))
-          ((eq tem '&lambda)
-           (throw 'exit
-             (cond ((null p)
-                    (list (+ sexp-column 4) containing-form-start))
-                   ((null (cdr p))
-                    (+ sexp-column 1))
-                   (t normal-indent))))
+		 (throw 'exit (if (consp normal-indent)
+				  normal-indent
+				(list normal-indent containing-form-start))))
+		((eq tem '&lambda)
+		 (throw 'exit
+			(cond ((null p)
+			       (list (+ sexp-column 4) containing-form-start))
+			      ((null (cdr p))
+			       (+ sexp-column 1))
+			      (t normal-indent))))
                 ((integerp tem)
                  (throw 'exit
                    (if (null p)         ;not in subforms