From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 29 Jan 2022 04:39:31 +0000 (-0500)
Subject: * src/data.c (Ffset, defalias): Complete last change
X-Git-Tag: emacs-29.0.90~2680
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=70fc32f6ddef871dd2ae15a3333974f6d8231d6a;p=emacs.git

* src/data.c (Ffset, defalias): Complete last change

Somehow part of the autoload history handling was left behind in `Ffset`
when the rest was moved to `defalias`.  Finish the job.

* src/data.c (Ffset): Don't set the `autoload` property here...
(defalias): ... set it here instead.
---

diff --git a/src/data.c b/src/data.c
index dd6ec4c41a8..039e6c31134 100644
--- a/src/data.c
+++ b/src/data.c
@@ -846,9 +846,6 @@ DEFUN ("fset", Ffset, Sfset, 2, 2, 0,
 
   function = XSYMBOL (symbol)->u.s.function;
 
-  if (AUTOLOADP (function))
-    Fput (symbol, Qautoload, XCDR (function));
-
   eassert (valid_lisp_object_p (definition));
 
 #ifdef HAVE_NATIVE_COMP
@@ -880,6 +877,9 @@ defalias (Lisp_Object symbol, Lisp_Object definition)
 
         if (!NILP (Vautoload_queue) && !NILP (function))
           Vautoload_queue = Fcons (Fcons (symbol, function), Vautoload_queue);
+
+        if (AUTOLOADP (function))
+          Fput (symbol, Qautoload, XCDR (function));
       }
   }