diff options
author | Yuan Fu <casouri@gmail.com> | 2025-03-13 20:18:03 -0700 |
---|---|---|
committer | Yuan Fu <casouri@gmail.com> | 2025-03-13 20:18:03 -0700 |
commit | f2f1fb7fe00d6d69fc081f423c1f9dff0f618e36 (patch) | |
tree | a34b67556422221faf26d24c95e0a93d8dfed961 /lisp/subr.el | |
parent | 89441e12e2a25d43d1d5567ac356a7ecb8193063 (diff) | |
parent | defc55bb6f954276a1cb9e3b5c50251ba5e5b40f (diff) | |
download | emacs-f2f1fb7fe00d6d69fc081f423c1f9dff0f618e36.tar.gz emacs-f2f1fb7fe00d6d69fc081f423c1f9dff0f618e36.tar.bz2 emacs-f2f1fb7fe00d6d69fc081f423c1f9dff0f618e36.zip |
Merge from origin/emacs-30
defc55bb6f9 Fix treesit-parser-create behavior regarding indirect buf...
20ac26e6751 ; Fix with-delayed-message docstring metavars.
04034cd9ce7 Fix 'dired-movement-style' in Dired when subdirs are shown
f8443dffc1f ; * lisp/register.el (register-use-preview): Doc fix (bug...
f729828bcfb ; Add texinfo reference to GNU Coding Standards.
a6abb88fdcc ; * lisp/files.el (executable-find): Doc fix.
# Conflicts:
# src/treesit.c
Diffstat (limited to 'lisp/subr.el')
-rw-r--r-- | lisp/subr.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index 689f6c362a9..10b7da3535b 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -7451,7 +7451,7 @@ not a list, return a one-element list containing OBJECT." The MESSAGE form will be evaluated immediately, but the resulting string will be displayed only if BODY takes longer than TIMEOUT seconds. -\(fn (timeout message) &rest body)" +\(fn (TIMEOUT MESSAGE) &rest BODY)" (declare (indent 1)) `(funcall-with-delayed-message ,(car args) ,(cadr args) (lambda () |