Mercurial > emacs

diff src/fns.c @ 61622:aef105b11011

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Vloads_in_progress): Remove extern. (load_in_progress): Add extern. (Frequire): Use load_in_progress instead of Vloads_in_progress.
author Lute Kamstra <lute@gnu.org>
date Mon, 18 Apr 2005 10:20:46 +0000
parents 74a256d5f3ec
children e4fc95d95925
line wrap: on
line diff
--- a/src/fns.c	Mon Apr 18 09:41:15 2005 +0000
+++ b/src/fns.c	Mon Apr 18 10:20:46 2005 +0000
@@ -66,7 +66,7 @@
 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 @@
      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)))