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

already provided.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4cc611c5854483a10cbd0e47b55e90d43069b79f..f48bed6deb262d3bffd391b3a7dff67f102a2cc0 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-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 3774aeb9409ad553335d35d7ba4780821e62f121..ce8efbfbcd1cc8b6a8466beca939ee99e2d0f992 100644 (file)
--- 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))