diff options
| author | Dave Love <fx@gnu.org> | 2002-11-29 20:06:55 +0000 |
|---|---|---|
| committer | Dave Love <fx@gnu.org> | 2002-11-29 20:06:55 +0000 |
| commit | aa9ecab9541497cad32ca7e9a620319d77fff095 (patch) | |
| tree | be9bff1b33a449c824b614dfba1b0a432900a30c | |
| parent | e48d9bbf9e2ac0bad70ce3fedbdcca93b1bac0e8 (diff) | |
| download | emacs-aa9ecab9541497cad32ca7e9a620319d77fff095.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 | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 25e4df809ff..fd1fbaade2a 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-14 Francesco Potorti` <pot@gnu.org> * s/sol2-8.h: New file. diff --git a/src/fns.c b/src/fns.c index 251286970a3..abc1e276477 100644 --- 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; |