diff options
| author | Juanma Barranquero | 2007-10-29 00:32:45 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2007-10-29 00:32:45 +0000 |
| commit | 3888559e6b55a086ff889668fac075881758653b (patch) | |
| tree | 05fd17b451a0df95f1e2c8569e9e4f22e7df54ad /src | |
| parent | 62f7f21b371706f3e53e524087f777cbe2b61bd1 (diff) | |
| download | emacs-3888559e6b55a086ff889668fac075881758653b.tar.gz emacs-3888559e6b55a086ff889668fac075881758653b.zip | |
(syms_of_emacs) <kill-emacs-hook>: Fix typo in docstring.
<installation-directory>: Reflow docstring.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/emacs.c | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 05995663862..9e31fcf1a15 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-10-29 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * emacs.c (syms_of_emacs) <kill-emacs-hook>: Fix typo in docstring. | ||
| 4 | <installation-directory>: Reflow docstring. | ||
| 5 | |||
| 1 | 2007-10-26 Martin Rudalics <rudalics@gmx.at> | 6 | 2007-10-26 Martin Rudalics <rudalics@gmx.at> |
| 2 | 7 | ||
| 3 | * window.c (window_min_size_2): Don't count header-line. | 8 | * window.c (window_min_size_2): Don't count header-line. |
diff --git a/src/emacs.c b/src/emacs.c index 4910244fd81..db42067f704 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -2467,7 +2467,7 @@ Emacs is running. */); | |||
| 2467 | doc: /* Non-nil means Emacs is running without interactive terminal. */); | 2467 | doc: /* Non-nil means Emacs is running without interactive terminal. */); |
| 2468 | 2468 | ||
| 2469 | DEFVAR_LISP ("kill-emacs-hook", &Vkill_emacs_hook, | 2469 | DEFVAR_LISP ("kill-emacs-hook", &Vkill_emacs_hook, |
| 2470 | doc: /* Hook to be run when kill-emacs is called. | 2470 | doc: /* Hook to be run when `kill-emacs' is called. |
| 2471 | Since `kill-emacs' may be invoked when the terminal is disconnected (or | 2471 | Since `kill-emacs' may be invoked when the terminal is disconnected (or |
| 2472 | in other similar situations), functions placed on this hook should not | 2472 | in other similar situations), functions placed on this hook should not |
| 2473 | expect to be able to interact with the user. To ask for confirmation, | 2473 | expect to be able to interact with the user. To ask for confirmation, |
| @@ -2506,9 +2506,8 @@ The value is nil if that directory's name is not known. */); | |||
| 2506 | 2506 | ||
| 2507 | DEFVAR_LISP ("installation-directory", &Vinstallation_directory, | 2507 | DEFVAR_LISP ("installation-directory", &Vinstallation_directory, |
| 2508 | doc: /* A directory within which to look for the `lib-src' and `etc' directories. | 2508 | doc: /* A directory within which to look for the `lib-src' and `etc' directories. |
| 2509 | This is non-nil when we can't find those directories in their standard | 2509 | This is non-nil when we can't find those directories in their standard installed |
| 2510 | installed locations, but we can find them | 2510 | locations, but we can find them near where the Emacs executable was found. */); |
| 2511 | near where the Emacs executable was found. */); | ||
| 2512 | Vinstallation_directory = Qnil; | 2511 | Vinstallation_directory = Qnil; |
| 2513 | 2512 | ||
| 2514 | DEFVAR_LISP ("system-messages-locale", &Vsystem_messages_locale, | 2513 | DEFVAR_LISP ("system-messages-locale", &Vsystem_messages_locale, |