Mercurial > emacs
changeset 47839:8d4ba9addc8e
*** empty log message ***
| author | Markus Rost <rost@math.uni-bielefeld.de> |
|---|---|
| date | Fri, 11 Oct 2002 05:38:53 +0000 |
| parents | f7c5a53cf917 |
| children | 868ca431eff1 |
| files | src/ChangeLog src/emacs.c src/lread.c |
| diffstat | 3 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Oct 11 02:27:30 2002 +0000 +++ b/src/ChangeLog Fri Oct 11 05:38:53 2002 +0000 @@ -1,3 +1,10 @@ +2002-10-11 Markus Rost <rost@math.ohio-state.edu> + + * emacs.c (syms_of_emacs) <kill-emacs-hook>: Doc fix (not run in + batch mode). + + * lread.c (Fload): Doc fix (load-suffixes). + 2002-10-10 Steven Tamm <steventamm@mac.com> * macterm.c (syms_of_macterm, mac_get_mouse_btn): Reversed
--- a/src/emacs.c Fri Oct 11 02:27:30 2002 +0000 +++ b/src/emacs.c Fri Oct 11 05:38:53 2002 +0000 @@ -2302,11 +2302,13 @@ doc: /* Non-nil means Emacs is running without interactive terminal. */); DEFVAR_LISP ("kill-emacs-hook", &Vkill_emacs_hook, - doc: /* Hook to be run whenever kill-emacs is called. -Since kill-emacs may be invoked when the terminal is disconnected (or + doc: /* Hook to be run when kill-emacs is called. +Since `kill-emacs' may be invoked when the terminal is disconnected (or in other similar situations), functions placed on this hook should not expect to be able to interact with the user. To ask for confirmation, -see `kill-emacs-query-functions' instead. */); +see `kill-emacs-query-functions' instead. + +The hook is not run in batch mode, i.e., if `noninteractive' is non-nil. */); Vkill_emacs_hook = Qnil; empty_string = build_string ("");
--- a/src/lread.c Fri Oct 11 02:27:30 2002 +0000 +++ b/src/lread.c Fri Oct 11 05:38:53 2002 +0000 @@ -641,7 +641,8 @@ DEFUN ("load", Fload, Sload, 1, 5, 0, doc: /* Execute a file of Lisp code named FILE. First try FILE with `.elc' appended, then try with `.el', - then try FILE unmodified. Environment variable references in FILE + then try FILE unmodified (the exact suffixes are determined by +`load-suffixes'). Environment variable references in FILE are replaced with their values by calling `substitute-in-file-name'. This function searches the directories in `load-path'. If optional second arg NOERROR is non-nil,