From: Lute Kamstra <lute@gnu.org>
Date: Mon, 18 Apr 2005 10:20:46 +0000 (+0000)
Subject: (Vloads_in_progress): Remove extern.
X-Git-Tag: ttn-vms-21-2-B4~929
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7aed223df91314cb90295e9199ad960aec71a312;p=emacs.git

(Vloads_in_progress): Remove extern.
(load_in_progress): Add extern.
(Frequire): Use load_in_progress instead of Vloads_in_progress.
---

diff --git a/src/fns.c b/src/fns.c
index e921579f79b..daa9e10c465 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)))