diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-04-13 09:02:29 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-04-13 09:02:29 -0700 |
| commit | 0a4b992c422d98fbb351d3b03265eb1029012c1d (patch) | |
| tree | 8216a67339ed2fecc3d889678278b9a3cb7fb914 /lisp/emacs-lisp | |
| parent | d0b9cf876fa62e3584a062e123a87e28278782cf (diff) | |
| parent | 1dfc497fac22c199a944ef64233266bd6cd2fee6 (diff) | |
| download | emacs-0a4b992c422d98fbb351d3b03265eb1029012c1d.tar.gz emacs-0a4b992c422d98fbb351d3b03265eb1029012c1d.tar.bz2 emacs-0a4b992c422d98fbb351d3b03265eb1029012c1d.zip | |
Merge from origin/emacs-27
1dfc497fac Minor wording change in Introduction to Programming in Ema...
ff09b4eeac Fix 'flymake-show-diagnostics-buffer' when line numbers ar...
63e8d0ea87 Fix last changes describing mail commands
01212a762f Do setup Flymake in file-less Elisp buffers
36873ef2b2 Fix error message for ‘cl-struct-unknown-slot’ (bug#39995)
3f9310b0fe Fix and improve documentation of mail-related features
1482a75efa Fix build failure with Fx_gtk_debug
cf57663f2a Mention jit-lock deferred as an alternative to fast-but-im...
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 45a308ebcac..bb10194a946 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -3118,7 +3118,7 @@ slots skipped by :initial-offset may appear in the list." descs))) (nreverse descs))) -(define-error 'cl-struct-unknown-slot "struct %S has no slot %S") +(define-error 'cl-struct-unknown-slot "struct has no slot") (defun cl-struct-slot-offset (struct-type slot-name) "Return the offset of slot SLOT-NAME in STRUCT-TYPE. |