(Frequire): Don't call LOADHIST_ATTACH if feature was

already provided.

diff --git a/src/ChangeLog b/src/ChangeLog
index 25e4df809ff65d3a35594a047a3a56ea9df2f728..fd1fbaade2af66296f0e0d819370c542adc81296 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-29  Dave Love  <fx@gnu.org>
+
+       * fns.c (Frequire): Don't call LOADHIST_ATTACH if feature was
+       already provided.
+
 2002-11-14  Francesco Potorti`  <pot@gnu.org>
 
        * s/sol2-8.h: New file.

diff --git a/src/fns.c b/src/fns.c
index 251286970a3f360aab9945e80e63253bbcb7370e..abc1e2764773be407161cae80bdf9b7f5887d375 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -1,5 +1,5 @@
 /* Random utility Lisp functions.
-   Copyright (C) 1985, 86, 87, 93, 94, 95, 97, 98, 99, 2000, 2001
+   Copyright (C) 1985, 86, 87, 93, 94, 95, 97, 98, 99, 2000, 2001, 2002
    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -3076,13 +3076,13 @@ The normal messages at start and end of loading FILENAME are suppressed.")
   register Lisp_Object tem;
   CHECK_SYMBOL (feature, 0);
   tem = Fmemq (feature, Vfeatures);
-
-  LOADHIST_ATTACH (Fcons (Qrequire, feature));
   
   if (NILP (tem))
     {
       int count = specpdl_ptr - specpdl;
 
+      LOADHIST_ATTACH (Fcons (Qrequire, feature));
+
       /* Value saved here is to be restored into Vautoload_queue */
       record_unwind_protect (un_autoload, Vautoload_queue);
       Vautoload_queue = Qt;