# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1161895193 0
# Node ID f93751296dc3b6e9ecf7edcc5affc3765b268492
# Parent  d818bffc81386f203b1968b2c28f0b4a70a8daf1
	* emacs-lisp/cl-indent.el (lisp-indent-259): Indent nil's in the
	pattern normally.

diff -r d818bffc8138 -r f93751296dc3 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Oct 26 16:20:23 2006 +0000
+++ b/lisp/ChangeLog	Thu Oct 26 20:39:53 2006 +0000
@@ -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 -r d818bffc8138 -r f93751296dc3 lisp/emacs-lisp/cl-indent.el
--- a/lisp/emacs-lisp/cl-indent.el	Thu Oct 26 16:20:23 2006 +0000
+++ b/lisp/emacs-lisp/cl-indent.el	Thu Oct 26 20:39:53 2006 +0000
@@ -373,14 +373,14 @@
                      ;; 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