mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-03 04:21:28 -08:00
Code Issues Projects Releases Wiki Activity

(Vloads_in_progress): Static.

Browse source
This commit is contained in:
Lute Kamstra 2005-04-18 10:22:20 +00:00
parent 7aed223df9
commit 9942fa0cc1
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -1,3 +1,10 @@
2005-04-18 Lute Kamstra <lute@gnu.org>
* lread.c (Vloads_in_progress): Static.
* fns.c (Vloads_in_progress): Remove extern.
(load_in_progress): Add extern.
(Frequire): Use load_in_progress instead of Vloads_in_progress.
2005-04-18 Thien-Thi Nguyen <ttn@gnu.org>
* xmenu.c (Fx_popup_menu): Initialize error_name to NULL.
@ -119,7 +126,6 @@
into "(any string)".
* lread.c (Vloads_in_progress): Not static.
* fns.c (Vloads_in_progress): Add extern.
(Frequire): Don't do LOADHIST_ATTACH if Vloads_in_progress is nil.

6
src/lread.c
View file

@ -1,6 +1,6 @@
/* Lisp parsing and input streams.
Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, 1997, 1998,
1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@ -89,7 +89,7 @@ Lisp_Object Qinhibit_file_name_operation;
extern Lisp_Object Qevent_symbol_element_mask;
extern Lisp_Object Qfile_exists_p;
/* non-zero if inside `load' */
/* non-zero iff inside `load' */
int load_in_progress;
/* Directory in which the sources were found. */
@ -193,7 +193,7 @@ static int new_backquote_flag;
/* A list of file names for files being loaded in Fload. Used to
check for recursive loads. */
Lisp_Object Vloads_in_progress;
static Lisp_Object Vloads_in_progress;
/* Non-zero means load dangerous compiled Lisp files. */