# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1192384831 0
# Node ID de1e5c00a8ce5b5216493ed44768235be348d87b
# Parent  b27741b11f5aa946581b376db3dc591b61e1b22d
(Ffset): Save autoload of the function being set.

diff -r b27741b11f5a -r de1e5c00a8ce src/data.c
--- a/src/data.c	Sun Oct 14 18:00:05 2007 +0000
+++ b/src/data.c	Sun Oct 14 18:00:31 2007 +0000
@@ -662,12 +662,20 @@
      (symbol, definition)
      register Lisp_Object symbol, definition;
 {
+  register Lisp_Object function;
+
   CHECK_SYMBOL (symbol);
   if (NILP (symbol) || EQ (symbol, Qt))
     xsignal1 (Qsetting_constant, symbol);
-  if (!NILP (Vautoload_queue) && !EQ (XSYMBOL (symbol)->function, Qunbound))
-    Vautoload_queue = Fcons (Fcons (symbol, XSYMBOL (symbol)->function),
-			     Vautoload_queue);
+
+  function = XSYMBOL (symbol)->function;
+
+  if (!NILP (Vautoload_queue) && !EQ (function, Qunbound))
+    Vautoload_queue = Fcons (Fcons (symbol, function), Vautoload_queue);
+
+  if (CONSP (function) && EQ (XCAR (function), Qautoload))
+    Fput (symbol, Qautoload, XCDR (function));
+
   XSYMBOL (symbol)->function = definition;
   /* Handle automatic advice activation */
   if (CONSP (XSYMBOL (symbol)->plist) && !NILP (Fget (symbol, Qad_advice_info)))