diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/emacs.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ad87bbc9dad..01d3a9430d1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2006-11-02 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * emacs.c (Fkill_emacs): Fix typo in docstring. | ||
| 4 | |||
| 1 | 2006-11-02 Nozomu Ando <nand@mac.com> | 5 | 2006-11-02 Nozomu Ando <nand@mac.com> |
| 2 | 6 | ||
| 3 | * unexmacosx.c (mach_header, segment_command, vm_region, section) | 7 | * 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) | |||
| 2051 | DEFUN ("kill-emacs", Fkill_emacs, Skill_emacs, 0, 1, "P", | 2051 | DEFUN ("kill-emacs", Fkill_emacs, Skill_emacs, 0, 1, "P", |
| 2052 | doc: /* Exit the Emacs job and kill it. | 2052 | doc: /* Exit the Emacs job and kill it. |
| 2053 | If ARG is an integer, return ARG as the exit program code. | 2053 | If ARG is an integer, return ARG as the exit program code. |
| 2054 | If ARG is a string, stuff it as keyboard input. | 2054 | If ARG is a string, stuff it as keyboard input. |
| 2055 | 2055 | ||
| 2056 | The value of `kill-emacs-hook', if not void, | 2056 | The value of `kill-emacs-hook', if not void, |
| 2057 | is a list of functions (of no args), | 2057 | is a list of functions (of no args), |