# HG changeset patch
# User Markus Rost <rost@math.uni-bielefeld.de>
# Date 1034314733 0
# Node ID 8d4ba9addc8e77f31d0c63d3510e0b848685f1fc
# Parent  f7c5a53cf917d52aa2c8fbefce3e866a8c0c28a0
*** empty log message ***

diff -r f7c5a53cf917 -r 8d4ba9addc8e src/ChangeLog
--- 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
diff -r f7c5a53cf917 -r 8d4ba9addc8e src/emacs.c
--- 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 ("");
diff -r f7c5a53cf917 -r 8d4ba9addc8e src/lread.c
--- 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,