diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2024-07-19 14:31:53 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2024-07-19 14:31:53 -0400 |
| commit | 153732e63813d34b057ab24fbd9e134bd3be6eaa (patch) | |
| tree | b00d01d4b7eade4471e969206d1ad0c476d42027 /lisp/emacs-lisp | |
| parent | 6c96d062815b8949dc5af7d544c8aaf048433bb1 (diff) | |
| parent | a478423d19fe320972fc319dd2cf7fdbca914754 (diff) | |
| download | emacs-153732e63813d34b057ab24fbd9e134bd3be6eaa.tar.gz emacs-153732e63813d34b057ab24fbd9e134bd3be6eaa.tar.bz2 emacs-153732e63813d34b057ab24fbd9e134bd3be6eaa.zip | |
Merge from origin/emacs-30
a478423d19f * lisp/progmodes/peg.el (peg-syntax-classes): Typo (bug#7...
951fb93956d * lisp/transient.el (static-if): Remove duplicated defini...
0218fb21437 Adapt file-remote-p doc
34c1094e607 ; Fix typo in etc/ORG-NEWS (Bug#72186)
5916b172bdc * etc/TODO: Delete item about merging Magit.
a6cab228d4d ; Fix typos
41dc28244f2 * doc/man/emacs.1.in: Add "No warranty" notice.
b2ac3435867 ; * doc/man/emacs.1.in: Improve wording.
110b3d08d73 Improve emacs man page description of --user flag
4911f08912a Checkdoc fixes in allout-widgets.el
109b592d77b Checkdoc fixes in subr.el
46436720787 Checkdoc fixes in touch-screen.el
9889774c62e Checkdoc fixes in treesit.el
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/byte-run.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index 2fa646f2531..75cfc7b32d3 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -334,7 +334,7 @@ This is used by `declare'.") (f (apply (car f) name arglist (cdr x))) ;; Yuck!! ((and (featurep 'cl) - (memq (car x) ;C.f. cl--do-proclaim. + (memq (car x) ;Cf. cl--do-proclaim. '(special inline notinline optimize warn))) (push (list 'declare x) cl-decls) nil) |