aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDave Love2002-11-29 20:09:16 +0000
committerDave Love2002-11-29 20:09:16 +0000
commitc02138c61e07a2c13f266af4ff708277390a411b (patch)
treeb5031f0c38624995ac8f4a27d41cc1ee8ad8e0f5 /src
parentbdcfe844b873dcf3504a8381957a74a0874cf0a1 (diff)
downloademacs-c02138c61e07a2c13f266af4ff708277390a411b.tar.gz
emacs-c02138c61e07a2c13f266af4ff708277390a411b.zip
(Frequire): Don't call LOADHIST_ATTACH if feature was
already provided.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/fns.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4cc611c5854..f48bed6deb2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12002-11-29 Dave Love <fx@gnu.org>
2
3 * fns.c (Frequire): Don't call LOADHIST_ATTACH if feature was
4 already provided.
5
12002-11-29 Richard M. Stallman <rms@gnu.org> 62002-11-29 Richard M. Stallman <rms@gnu.org>
2 7
3 * xdisp.c (start_display): Check more intelligently for 8 * 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. */)
3245 CHECK_SYMBOL (feature); 3245 CHECK_SYMBOL (feature);
3246 3246
3247 tem = Fmemq (feature, Vfeatures); 3247 tem = Fmemq (feature, Vfeatures);
3248
3249 LOADHIST_ATTACH (Fcons (Qrequire, feature));
3250 3248
3251 if (NILP (tem)) 3249 if (NILP (tem))
3252 { 3250 {
3253 int count = SPECPDL_INDEX (); 3251 int count = SPECPDL_INDEX ();
3254 int nesting = 0; 3252 int nesting = 0;
3255 3253
3254 LOADHIST_ATTACH (Fcons (Qrequire, feature));
3255
3256 /* This is to make sure that loadup.el gives a clear picture 3256 /* This is to make sure that loadup.el gives a clear picture
3257 of what files are preloaded and when. */ 3257 of what files are preloaded and when. */
3258 if (! NILP (Vpurify_flag)) 3258 if (! NILP (Vpurify_flag))