From: Dave Love <fx@gnu.org>
Date: Fri, 29 Nov 2002 20:09:16 +0000 (+0000)
Subject: (Frequire): Don't call LOADHIST_ATTACH if feature was
X-Git-Tag: ttn-vms-21-2-B4~12224
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c02138c61e07a2c13f266af4ff708277390a411b;p=emacs.git

(Frequire): Don't call LOADHIST_ATTACH if feature was
already provided.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 4cc611c5854..f48bed6deb2 100644
--- 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-29  Richard M. Stallman  <rms@gnu.org>
 
 	* xdisp.c (start_display): Check more intelligently for
diff --git a/src/fns.c b/src/fns.c
index 3774aeb9409..ce8efbfbcd1 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -3245,14 +3245,14 @@ The normal messages at start and end of loading FILENAME are suppressed.  */)
   CHECK_SYMBOL (feature);
 
   tem = Fmemq (feature, Vfeatures);
-
-  LOADHIST_ATTACH (Fcons (Qrequire, feature));
   
   if (NILP (tem))
     {
       int count = SPECPDL_INDEX ();
       int nesting = 0;
 
+      LOADHIST_ATTACH (Fcons (Qrequire, feature));
+
       /* This is to make sure that loadup.el gives a clear picture
 	 of what files are preloaded and when.  */
       if (! NILP (Vpurify_flag))