From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 2 May 2022 10:30:19 +0000 (+0200)
Subject: Fix eldoc interaction with `when' and `unless'
X-Git-Tag: emacs-29.0.90~1931^2~130
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ee913faf9a5d266be41b33556c90b26f55d18013;p=emacs.git

Fix eldoc interaction with `when' and `unless'

* lisp/subr.el (when, unless): Remove the (fn...) bits from the
doc string, because the advertised calling convention is correct
the way it is (bug#27229).  This also makes eldoc highlight the
arguments correctly.
---

diff --git a/lisp/subr.el b/lisp/subr.el
index ad3494a2fa7..cb7572423af 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -243,18 +243,14 @@ change the list."
 (defmacro when (cond &rest body)
   "If COND yields non-nil, do BODY, else return nil.
 When COND yields non-nil, eval BODY forms sequentially and return
-value of last one, or nil if there are none.
-
-\(fn COND BODY...)"
+value of last one, or nil if there are none."
   (declare (indent 1) (debug t))
   (list 'if cond (cons 'progn body)))
 
 (defmacro unless (cond &rest body)
   "If COND yields nil, do BODY, else return nil.
 When COND yields nil, eval BODY forms sequentially and return
-value of last one, or nil if there are none.
-
-\(fn COND BODY...)"
+value of last one, or nil if there are none."
   (declare (indent 1) (debug t))
   (cons 'if (cons cond (cons nil body))))