aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLute Kamstra <[email protected]>2005-04-18 10:20:46 +0000
committerLute Kamstra <[email protected]>2005-04-18 10:20:46 +0000
commit7aed223df91314cb90295e9199ad960aec71a312 (patch)
tree97ee2b4f068bb32b33a5bfbb644e3aaffee4e633
parent999cdb8fc7062b88e16d91f465c2e8beb964b431 (diff)
(Vloads_in_progress): Remove extern.
(load_in_progress): Add extern. (Frequire): Use load_in_progress instead of Vloads_in_progress.
-rw-r--r--src/fns.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fns.c b/src/fns.c
index e921579f79..daa9e10c46 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -66,7 +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;
+extern int load_in_progress;
Lisp_Object Qstring_lessp, Qprovide, Qrequire;
Lisp_Object Qyes_or_no_p_history;
@@ -3460,7 +3460,7 @@ The normal messages at start and end of loading FILENAME are suppressed. */)
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))
+ if (load_in_progress)
{
tem = Fcons (Qrequire, feature);
if (NILP (Fmember (tem, Vcurrent_load_list)))