From: Glenn Morris <rgm@gnu.org>
Date: Sat, 20 Sep 2008 21:55:04 +0000 (+0000)
Subject: (lisp-indent-offset): Fix custom type.  (Bug#1011)
X-Git-Tag: emacs-pretest-23.0.90~2822
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f3681087a3c53cb1218be5b66e28b1668f9a8337;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4617cf81427..9dd02596ef0 100644
--- 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 011f1f57dff..37d2d0cb47f 100644
--- 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))))