[Emacs-diffs] master 336681f 3/3: Merge from origin/emacs-26

[Glenn Morris]

branch: master
commit 336681f35bf23f442a7159eb86d1c5d8a6269c7f
Merge: feea5c6 d667318
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Merge from origin/emacs-26
    
    d667318 (origin/emacs-26) Fix two Edebug defcustoms (bug#33428)
---
 lisp/emacs-lisp/edebug.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 15f68a6..b50b038 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."