mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-13 06:50:39 -08:00
Code Issues Projects Releases Wiki Activity

(Vloads_in_progress): Add extern.

Browse source 
(Frequire): Don't do LOADHIST_ATTACH if Vloads_in_progress is nil.
This commit is contained in:
Richard M. Stallman 2005-04-10 00:28:00 +00:00
parent 6183d8422d
commit 9d5c2e7e2c
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/fns.c
View file

@ -66,6 +66,7 @@ int use_file_dialog;
extern int minibuffer_auto_raise;
extern Lisp_Object minibuf_window;
extern Lisp_Object Vlocale_coding_system;
extern Lisp_Object Vloads_in_progress;
Lisp_Object Qstring_lessp, Qprovide, Qrequire;
Lisp_Object Qyes_or_no_p_history;
@ -3444,9 +3445,15 @@ The normal messages at start and end of loading FILENAME are suppressed. */)
CHECK_SYMBOL (feature);
/* Record the presence of `require' in this file
even if the feature specified is already loaded. */
LOADHIST_ATTACH (Fcons (Qrequire, feature));
even if the feature specified is already loaded.
But not more than once in any file,
and not when we aren't loading a file. */
if (! NILP (Vloads_in_progress))
{
tem = Fcons (Qrequire, feature);
if (NILP (Fmember (tem, Vcurrent_load_list)))
LOADHIST_ATTACH (tem);
}
tem = Fmemq (feature, Vfeatures);
if (NILP (tem))