(lisp-indent-offset): Fix custom type. (Bug#1011)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4617cf81427fa2b539af01ae716ed460af1aa5fe..9dd02596ef0be4948b5b8716e8bff6d8233528c4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-20  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp/lisp-mode.el (lisp-indent-offset):
+       Fix custom type.  (Bug#1011)
+
 2008-09-20  David De La Harpe Golden  <david@harpegolden.net>
 
         * files.el (move-file-to-trash): Avoid recursive trashing if

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 011f1f57dffd747f088ef13bd0dd082e111df25d..37d2d0cb47f8e809988d33679525e4480c620089 100644 (file)
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -869,7 +869,7 @@ which see."
 (defcustom lisp-indent-offset nil
   "If non-nil, indent second line of expressions that many more columns."
   :group 'lisp
-  :type '(choice nil integer))
+  :type '(choice (const nil) integer))
 (put 'lisp-body-indent 'safe-local-variable
      (lambda (x) (or (null x) (integerp x))))