*** empty log message ***

diff --git a/src/ChangeLog b/src/ChangeLog
index 37bbae8866aa490949934b278d01a9529d7fad01..b0c1d0b132d3e8f3d1a8ba93818250d3ba9b4fac 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/emacs.c b/src/emacs.c
index 96e33928a51d8b32fa40b4b0c5596ffabf03ead6..2bf28d0568cd482d52970949320532c1bea28958 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2302,11 +2302,13 @@ Emacs is running.  */);
               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 --git a/src/lread.c b/src/lread.c
index fa3b5cdd4ec451ac5bff79b87960bb22e03e208e..43fbe352f2c07513173c7926739642fdec332d9a 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -641,7 +641,8 @@ record_load_unwind (old)
 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,