From: Lute Kamstra Date: Mon, 18 Apr 2005 10:22:20 +0000 (+0000) Subject: (Vloads_in_progress): Static. X-Git-Tag: ttn-vms-21-2-B4~928 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9942fa0cc18035775715ce99a3af95ee02870016;p=emacs.git (Vloads_in_progress): Static. --- diff --git a/src/ChangeLog b/src/ChangeLog index a9ecedf1c53..953c38dbdb9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2005-04-18 Lute Kamstra + + * 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 * 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. diff --git a/src/lread.c b/src/lread.c index b634e70934b..cd0e7544ad4 100644 --- a/src/lread.c +++ b/src/lread.c @@ -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. */