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

	pattern normally.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1698eb2b9699367b4f567d66164bfba7f8d8f461..ad36d29542c19741a0e6691bd2905a2adde0b81d 100644 (file)
--- 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 c3ceb4c2f3af9e06f2c0833c701d65fab5f9bd27..679a9bb68fdf5a6795f21d93a7e824cc19afc306 100644 (file)
--- 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