From eab5957cca04a27f4b4224ffc1f650e7dbd4909f Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 27 Oct 2024 14:52:25 -0400 Subject: [PATCH] Tweak doc w.r.t to "void function" (bug#73886) * doc/lispref/functions.texi (Function Cells): Avoid talking about the function cell being void. * src/data.c (Fboundp, Ffmakunbound, Fsymbol_function): Don't suggest that "void" can be considered as a kind of value. (cherry picked from commit 9e1abf11fc1c3285cfa631ec71f3836d54e2c8d8) --- doc/lispref/functions.texi | 11 ++++------- src/data.c | 6 +++--- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index db2c4197144..bf80a21ee9f 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi @@ -1510,10 +1510,7 @@ indirect-function}. @kindex void-function This returns the object in the function cell of @var{symbol}. It does not check that the returned object is a legitimate function. - -If the function cell is void, the return value is @code{nil}. It is -impossible to distinguish between a function cell that is void and one -set to @code{nil}. +If the function is void, the return value is @code{nil}. @example @group @@ -1533,9 +1530,9 @@ set to @code{nil}. @end defun @cindex void function cell - If you have never given a symbol any function definition, we say -that that symbol's function cell is @dfn{void}. In other words, the -function cell does not have any Lisp object in it. If you try to call + If you have never given a symbol any function definition, its function +cell contains the default value @code{nil} and we say +that that function is @dfn{void}. If you try to call the symbol as a function, Emacs signals a @code{void-function} error. Unlike with void variables (@pxref{Void Variables}), a symbol's diff --git a/src/data.c b/src/data.c index 73dd2f5d4ed..66cf34c1e60 100644 --- a/src/data.c +++ b/src/data.c @@ -756,7 +756,7 @@ global value outside of any lexical scope. */) breaking backward compatibility, as some users of fboundp may expect t in particular, rather than any true value. */ DEFUN ("fboundp", Ffboundp, Sfboundp, 1, 1, 0, - doc: /* Return t if SYMBOL's function definition is neither void nor nil. */) + doc: /* Return t if SYMBOL's function definition is not nil. */) (Lisp_Object symbol) { CHECK_SYMBOL (symbol); @@ -785,7 +785,7 @@ DEFUN ("fmakunbound", Ffmakunbound, Sfmakunbound, 1, 1, 0, doc: /* Make SYMBOL's function definition be nil. Return SYMBOL. -If a function definition is nil or void, trying to call a function by +If a function definition is nil, trying to call a function by that name will cause a `void-function' error. For more details, see Info node `(elisp) Function Cells'. @@ -800,7 +800,7 @@ See also `makunbound'. */) } DEFUN ("symbol-function", Fsymbol_function, Ssymbol_function, 1, 1, 0, - doc: /* Return SYMBOL's function definition, or nil if that is void or nil. */) + doc: /* Return SYMBOL's function definition. */) (Lisp_Object symbol) { CHECK_SYMBOL (symbol); -- 2.39.5