diff options
| author | Lute Kamstra | 2005-04-18 10:20:46 +0000 |
|---|---|---|
| committer | Lute Kamstra | 2005-04-18 10:20:46 +0000 |
| commit | 7aed223df91314cb90295e9199ad960aec71a312 (patch) | |
| tree | 97ee2b4f068bb32b33a5bfbb644e3aaffee4e633 /src | |
| parent | 999cdb8fc7062b88e16d91f465c2e8beb964b431 (diff) | |
| download | emacs-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.c | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -66,7 +66,7 @@ int use_file_dialog; | |||
| 66 | extern int minibuffer_auto_raise; | 66 | extern int minibuffer_auto_raise; |
| 67 | extern Lisp_Object minibuf_window; | 67 | extern Lisp_Object minibuf_window; |
| 68 | extern Lisp_Object Vlocale_coding_system; | 68 | extern Lisp_Object Vlocale_coding_system; |
| 69 | extern Lisp_Object Vloads_in_progress; | 69 | extern int load_in_progress; |
| 70 | 70 | ||
| 71 | Lisp_Object Qstring_lessp, Qprovide, Qrequire; | 71 | Lisp_Object Qstring_lessp, Qprovide, Qrequire; |
| 72 | Lisp_Object Qyes_or_no_p_history; | 72 | Lisp_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))) |