diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-11-02 21:02:12 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-11-02 21:02:12 -0700 |
| commit | aa7542467238b06ed056054965ba444595b85453 (patch) | |
| tree | 3071c15ff777ef5727ccd254d9ddbf513a06c0cc /lisp/emacs-lisp | |
| parent | 5fcfdf433d74e8ecb35f86fdc071ce11ca0b0364 (diff) | |
| parent | a87ce5c4b41ca8146c764b1186a6162c069b1933 (diff) | |
| download | emacs-aa7542467238b06ed056054965ba444595b85453.tar.gz emacs-aa7542467238b06ed056054965ba444595b85453.tar.bz2 emacs-aa7542467238b06ed056054965ba444595b85453.zip | |
Merge from origin/emacs-26
a87ce5c4b4 * src/lisp.h (GCALIGNED): Clarify comment (Bug#29040).
8a31e9993f ; etc/NEWS: Add cpp-message-min-time-interval. (Bug#28961)
ac0bb9a192 Improve the doc of eshell-cmpl-* custom variables (Bug#25069)
36400c7dc9 Fix mouse-scrollbar offset on GNUstep and old macOS (bug#2...
04bc1410c2 Merge from Gnulib
6b08ad5263 Fix alignment portability problems
a9f8706fa8 Fix completion of colon after CSS property (Bug#29056)
9031dec527 ; * src/alloc.c (sweep_symbols): Fix last change.
fdd3dcfa4e * src/alloc.c (sweep_symbols): Tweak last change
27964af438 In frame parameters documentation mention desktop saving/r...
1bd4e7c243 ; Fix typo in ChangeLog.3
4182a60d31 Don't have frameset save the 'client' parameter (Bug#29067)
9d31a97092 ; Spelling fixes
460a25f212 Handle generic variables in cl-defgeneric Edebug spec
dc0a25c2f9 Give a more sensible message if file-attributes fails (Bug...
8453423c7c Avoid wrong value from file-attributes on Linux kernel bef...
70621e2571 Fix customization of debugger-print-function (Bug#29077)
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/cl-generic.el | 3 | ||||
| -rw-r--r-- | lisp/emacs-lisp/debug.el | 5 |
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 |