summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/cl-generic.el3
-rw-r--r--lisp/emacs-lisp/debug.el5
2 files changed, 5 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el
index 62befd4742a..00278996792 100644
--- a/lisp/emacs-lisp/cl-generic.el
+++ b/lisp/emacs-lisp/cl-generic.el
@@ -206,7 +206,8 @@ DEFAULT-BODY, if present, is used as the body of a default method.
\(fn NAME ARGS [DOC-STRING] [OPTIONS-AND-METHODS...] &rest DEFAULT-BODY)"
(declare (indent 2) (doc-string 3)
(debug
- (&define name cl-lambda-list lambda-doc
+ (&define [&or name ("setf" name :name setf)] listp
+ lambda-doc
[&rest [&or
("declare" &rest sexp)
(":argument-precedence-order" &rest sexp)
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 53b8db81321..1ebbc0e0086 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -51,8 +51,9 @@ the middle is discarded, and just the beginning and end are displayed."
(defcustom debugger-print-function #'cl-prin1
"Function used to print values in the debugger backtraces."
- :type 'function
- :options '(cl-prin1 prin1)
+ :type '(choice (const cl-prin1)
+ (const prin1)
+ function)
:version "26.1")
(defcustom debugger-bury-or-kill 'bury