summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-11-20 09:38:43 -0800
committerGlenn Morris <rgm@gnu.org>2018-11-20 09:38:43 -0800
commit336681f35bf23f442a7159eb86d1c5d8a6269c7f (patch)
tree8764d63ac6bef3f75bd79bc01308da8e7601fe39
parentfeea5c6489a52e4a26114cb6cf735c63fc1f70ee (diff)
parentd667318a7f89a9daeffca6fb47503889bd23f3bd (diff)
downloademacs-336681f35bf23f442a7159eb86d1c5d8a6269c7f.tar.gz
Merge from origin/emacs-26
d667318 (origin/emacs-26) Fix two Edebug defcustoms (bug#33428)
-rw-r--r--lisp/emacs-lisp/edebug.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 15f68a62aca..b50b0383da5 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -192,11 +192,11 @@ Use this with caution since it is not debugged."
(defcustom edebug-print-length 50
"If non-nil, default value of `print-length' for printing results in Edebug."
- :type 'integer
+ :type '(choice integer (const nil))
:group 'edebug)
(defcustom edebug-print-level 50
"If non-nil, default value of `print-level' for printing results in Edebug."
- :type 'integer
+ :type '(choice integer (const nil))
:group 'edebug)
(defcustom edebug-print-circle t
"If non-nil, default value of `print-circle' for printing results in Edebug."