* emacs-lisp/cl-indent.el (lisp-indent-259): Indent nil's in the

	pattern normally.

2 files changed, 13 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1698eb2b969..ad36d29542c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-26  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacs-lisp/cl-indent.el (lisp-indent-259): Indent nil's in the
+        pattern normally.
+
 2006-10-26  Nick Roberts  <nickrob@snap.net.nz>
 
         * bindings.el (mode-line-mode-menu): Remove bindings for global
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index c3ceb4c2f3a..679a9bb68fd 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -373,14 +373,14 @@ If nil, indent backquoted lists as data, i.e., like quoted lists."
                      ;; 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 normal-indent))
+                ((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