From c4e66bb2b567f9dced364013a84ba415dd55290d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 29 Jan 2022 09:12:30 +0200 Subject: [PATCH] Fix compiler warning due to a recent change * src/data.c (Ffset): Avoid compiler warning about 'function'. --- src/data.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/data.c b/src/data.c index 039e6c31134..a5a76a27554 100644 --- a/src/data.c +++ b/src/data.c @@ -836,7 +836,6 @@ DEFUN ("fset", Ffset, Sfset, 2, 2, 0, doc: /* Set SYMBOL's function definition to DEFINITION, and return DEFINITION. */) (register Lisp_Object symbol, Lisp_Object definition) { - register Lisp_Object function; CHECK_SYMBOL (symbol); /* Perhaps not quite the right error signal, but seems good enough. */ if (NILP (symbol) && !NILP (definition)) @@ -844,11 +843,11 @@ DEFUN ("fset", Ffset, Sfset, 2, 2, 0, think this one little sanity check is worth its cost, but anyway. */ xsignal1 (Qsetting_constant, symbol); - function = XSYMBOL (symbol)->u.s.function; - eassert (valid_lisp_object_p (definition)); #ifdef HAVE_NATIVE_COMP + register Lisp_Object function = XSYMBOL (symbol)->u.s.function; + if (comp_enable_subr_trampolines && SUBRP (function) && !SUBR_NATIVE_COMPILEDP (function)) -- 2.39.5