aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLute Kamstra2005-04-18 10:20:46 +0000
committerLute Kamstra2005-04-18 10:20:46 +0000
commit7aed223df91314cb90295e9199ad960aec71a312 (patch)
tree97ee2b4f068bb32b33a5bfbb644e3aaffee4e633 /src
parent999cdb8fc7062b88e16d91f465c2e8beb964b431 (diff)
downloademacs-7aed223df91314cb90295e9199ad960aec71a312.tar.gz
emacs-7aed223df91314cb90295e9199ad960aec71a312.zip
(Vloads_in_progress): Remove extern.
(load_in_progress): Add extern. (Frequire): Use load_in_progress instead of Vloads_in_progress.
Diffstat (limited to 'src')
-rw-r--r--src/fns.c4
1 files changed, 2 insertions, 2 deletions
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;
66extern int minibuffer_auto_raise; 66extern int minibuffer_auto_raise;
67extern Lisp_Object minibuf_window; 67extern Lisp_Object minibuf_window;
68extern Lisp_Object Vlocale_coding_system; 68extern Lisp_Object Vlocale_coding_system;
69extern Lisp_Object Vloads_in_progress; 69extern int load_in_progress;
70 70
71Lisp_Object Qstring_lessp, Qprovide, Qrequire; 71Lisp_Object Qstring_lessp, Qprovide, Qrequire;
72Lisp_Object Qyes_or_no_p_history; 72Lisp_Object Qyes_or_no_p_history;
@@ -3460,7 +3460,7 @@ The normal messages at start and end of loading FILENAME are suppressed. */)
3460 even if the feature specified is already loaded. 3460 even if the feature specified is already loaded.
3461 But not more than once in any file, 3461 But not more than once in any file,
3462 and not when we aren't loading a file. */ 3462 and not when we aren't loading a file. */
3463 if (! NILP (Vloads_in_progress)) 3463 if (load_in_progress)
3464 { 3464 {
3465 tem = Fcons (Qrequire, feature); 3465 tem = Fcons (Qrequire, feature);
3466 if (NILP (Fmember (tem, Vcurrent_load_list))) 3466 if (NILP (Fmember (tem, Vcurrent_load_list)))