diff options
| author | Dave Love <fx@gnu.org> | 2002-11-29 20:09:16 +0000 |
|---|---|---|
| committer | Dave Love <fx@gnu.org> | 2002-11-29 20:09:16 +0000 |
| commit | c02138c61e07a2c13f266af4ff708277390a411b (patch) | |
| tree | b5031f0c38624995ac8f4a27d41cc1ee8ad8e0f5 | |
| parent | bdcfe844b873dcf3504a8381957a74a0874cf0a1 (diff) | |
| download | emacs-c02138c61e07a2c13f266af4ff708277390a411b.tar.gz | |
(Frequire): Don't call LOADHIST_ATTACH if feature was
already provided.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/fns.c | 4 |
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 @@ +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)) |