diff options
| author | Juanma Barranquero | 2007-10-22 02:15:02 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2007-10-22 02:15:02 +0000 |
| commit | e79beb56d95030348653a23b684f7f6492b5eaa7 (patch) | |
| tree | 1867436daf27b56c1709570c625471f7b0ad3e45 /src | |
| parent | b9694062ed812df426978533ee2d8b4b90425cac (diff) | |
| download | emacs-e79beb56d95030348653a23b684f7f6492b5eaa7.tar.gz emacs-e79beb56d95030348653a23b684f7f6492b5eaa7.zip | |
(Fdump_emacs): Fix typo in message.
(syms_of_emacs) <kill-emacs-hook>: Fix typo in docstring.
<installation-directory>: Reflow docstring.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/emacs.c | 11 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1ed1d3a5d38..aa024ad7569 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,8 +1,14 @@ | |||
| 1 | 2007-10-22 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * emacs.c (Fdump_emacs): Fix typo in message. | ||
| 4 | (syms_of_emacs) <kill-emacs-hook>: Fix typo in docstring. | ||
| 5 | <installation-directory>: Reflow docstring. | ||
| 6 | |||
| 1 | 2007-10-22 Juri Linkov <juri@jurta.org> | 7 | 2007-10-22 Juri Linkov <juri@jurta.org> |
| 2 | 8 | ||
| 3 | * minibuf.c: Allow minibuffer default to be a list of default values. | 9 | * minibuf.c: Allow minibuffer default to be a list of default values. |
| 4 | With empty input use the first element of this list as returned default. | 10 | With empty input use the first element of this list as returned default. |
| 5 | (string_to_object): | 11 | (string_to_object) |
| 6 | (read_minibuf_noninteractive): If defalt is cons, set val to its car. | 12 | (read_minibuf_noninteractive): If defalt is cons, set val to its car. |
| 7 | (read_minibuf): If defalt is cons, set histstring to its car. | 13 | (read_minibuf): If defalt is cons, set histstring to its car. |
| 8 | (Fread_string): If default_value is cons, set val to its car. | 14 | (Fread_string): If default_value is cons, set val to its car. |
diff --git a/src/emacs.c b/src/emacs.c index 46d07b19936..9fbb0b32707 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -2229,10 +2229,10 @@ You must run Emacs in batch mode in order to dump it. */) | |||
| 2229 | { | 2229 | { |
| 2230 | fprintf (stderr, "**************************************************\n"); | 2230 | fprintf (stderr, "**************************************************\n"); |
| 2231 | fprintf (stderr, "Warning: Your system has a gap between BSS and the\n"); | 2231 | fprintf (stderr, "Warning: Your system has a gap between BSS and the\n"); |
| 2232 | fprintf (stderr, "heap (%lu byte). This usually means that exec-shield\n", | 2232 | fprintf (stderr, "heap (%lu bytes). This usually means that exec-shield\n", |
| 2233 | heap_bss_diff); | 2233 | heap_bss_diff); |
| 2234 | fprintf (stderr, "or something similar is in effect. The dump may\n"); | 2234 | fprintf (stderr, "or something similar is in effect. The dump may\n"); |
| 2235 | fprintf (stderr, "fail because of this. See the section about \n"); | 2235 | fprintf (stderr, "fail because of this. See the section about\n"); |
| 2236 | fprintf (stderr, "exec-shield in etc/PROBLEMS for more information.\n"); | 2236 | fprintf (stderr, "exec-shield in etc/PROBLEMS for more information.\n"); |
| 2237 | fprintf (stderr, "**************************************************\n"); | 2237 | fprintf (stderr, "**************************************************\n"); |
| 2238 | } | 2238 | } |
| @@ -2475,7 +2475,7 @@ Emacs is running. */); | |||
| 2475 | doc: /* Non-nil means Emacs is running without interactive terminal. */); | 2475 | doc: /* Non-nil means Emacs is running without interactive terminal. */); |
| 2476 | 2476 | ||
| 2477 | DEFVAR_LISP ("kill-emacs-hook", &Vkill_emacs_hook, | 2477 | DEFVAR_LISP ("kill-emacs-hook", &Vkill_emacs_hook, |
| 2478 | doc: /* Hook to be run when kill-emacs is called. | 2478 | doc: /* Hook to be run when `kill-emacs' is called. |
| 2479 | Since `kill-emacs' may be invoked when the terminal is disconnected (or | 2479 | Since `kill-emacs' may be invoked when the terminal is disconnected (or |
| 2480 | in other similar situations), functions placed on this hook should not | 2480 | in other similar situations), functions placed on this hook should not |
| 2481 | expect to be able to interact with the user. To ask for confirmation, | 2481 | expect to be able to interact with the user. To ask for confirmation, |
| @@ -2511,9 +2511,8 @@ The value is nil if that directory's name is not known. */); | |||
| 2511 | 2511 | ||
| 2512 | DEFVAR_LISP ("installation-directory", &Vinstallation_directory, | 2512 | DEFVAR_LISP ("installation-directory", &Vinstallation_directory, |
| 2513 | doc: /* A directory within which to look for the `lib-src' and `etc' directories. | 2513 | doc: /* A directory within which to look for the `lib-src' and `etc' directories. |
| 2514 | This is non-nil when we can't find those directories in their standard | 2514 | This is non-nil when we can't find those directories in their standard installed |
| 2515 | installed locations, but we can find them | 2515 | locations, but we can find them near where the Emacs executable was found. */); |
| 2516 | near where the Emacs executable was found. */); | ||
| 2517 | Vinstallation_directory = Qnil; | 2516 | Vinstallation_directory = Qnil; |
| 2518 | 2517 | ||
| 2519 | DEFVAR_LISP ("system-messages-locale", &Vsystem_messages_locale, | 2518 | DEFVAR_LISP ("system-messages-locale", &Vsystem_messages_locale, |