diff --git a/src/ChangeLog b/src/ChangeLog index ad87bbc9dad..01d3a9430d1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2006-11-02 Juanma Barranquero + + * emacs.c (Fkill_emacs): Fix typo in docstring. + 2006-11-02 Nozomu Ando * unexmacosx.c (mach_header, segment_command, vm_region, section) diff --git a/src/emacs.c b/src/emacs.c index af6b00bf244..1377a3d6b37 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -2051,7 +2051,7 @@ sort_args (argc, argv) DEFUN ("kill-emacs", Fkill_emacs, Skill_emacs, 0, 1, "P", doc: /* Exit the Emacs job and kill it. If ARG is an integer, return ARG as the exit program code. -If ARG is a string, stuff it as keyboard input. +If ARG is a string, stuff it as keyboard input. The value of `kill-emacs-hook', if not void, is a list of functions (of no args),