(Fdump_emacs): Fix typo in message.

(syms_of_emacs) <kill-emacs-hook>: Fix typo in docstring.
<installation-directory>: Reflow docstring.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1ed1d3a5d389d21c64f1ab7d49c62bfe05c4998a..aa024ad7569d0b80508dad2135c12bf094ae9294 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,14 @@
+2007-10-22  Juanma Barranquero  <lekktu@gmail.com>
+
+       * emacs.c (Fdump_emacs): Fix typo in message.
+       (syms_of_emacs) <kill-emacs-hook>: Fix typo in docstring.
+       <installation-directory>: Reflow docstring.
+
 2007-10-22  Juri Linkov  <juri@jurta.org>
 
        * minibuf.c: Allow minibuffer default to be a list of default values.
        With empty input use the first element of this list as returned default.
-       (string_to_object):
+       (string_to_object)
        (read_minibuf_noninteractive):  If defalt is cons, set val to its car.
        (read_minibuf): If defalt is cons, set histstring to its car.
        (Fread_string): If default_value is cons, set val to its car.

diff --git a/src/emacs.c b/src/emacs.c
index 46d07b19936cb0e9d10ddf9e4d337fe19aca5414..9fbb0b327078a9f43f2fa76d133baa36627fe601 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2229,10 +2229,10 @@ You must run Emacs in batch mode in order to dump it.  */)
     {
       fprintf (stderr, "**************************************************\n");
       fprintf (stderr, "Warning: Your system has a gap between BSS and the\n");
-      fprintf (stderr, "heap (%lu byte).  This usually means that exec-shield\n",
+      fprintf (stderr, "heap (%lu bytes).  This usually means that exec-shield\n",
                heap_bss_diff);
       fprintf (stderr, "or something similar is in effect.  The dump may\n");
-      fprintf (stderr, "fail because of this.  See the section about \n");
+      fprintf (stderr, "fail because of this.  See the section about\n");
       fprintf (stderr, "exec-shield in etc/PROBLEMS for more information.\n");
       fprintf (stderr, "**************************************************\n");
     }
@@ -2475,7 +2475,7 @@ 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 when kill-emacs is called.
+              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,
@@ -2511,9 +2511,8 @@ The value is nil if that directory's name is not known.  */);
 
   DEFVAR_LISP ("installation-directory", &Vinstallation_directory,
               doc: /* A directory within which to look for the `lib-src' and `etc' directories.
-This is non-nil when we can't find those directories in their standard
-installed locations, but we can find them
-near where the Emacs executable was found.  */);
+This is non-nil when we can't find those directories in their standard installed
+locations, but we can find them near where the Emacs executable was found.  */);
   Vinstallation_directory = Qnil;
 
   DEFVAR_LISP ("system-messages-locale", &Vsystem_messages_locale,