(copyright-current-gpl-version): Set to 3.

[bpt/emacs.git] / lisp / emacs-lisp / cl-indent.el

diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index 679a9bb..7c15af6 100644 (file)
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -1,7 +1,7 @@
 ;;; cl-indent.el --- enhanced lisp-indent mode
 
 ;; Copyright (C) 1987, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
 ;; Created: July 1987
@@ -373,7 +373,9 @@ 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 normal-indent))
+                (throw 'exit (if (consp normal-indent)
+                                 normal-indent
+                               (list normal-indent containing-form-start))))
                ((eq tem '&lambda)
                 (throw 'exit
                        (cond ((null p)