[Emacs-diffs] Changes to emacs/src/emacs.c,v [EMACS_22_BASE]

[Juanma Barranquero]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Juanma Barranquero <lektu>      07/10/29 00:30:43

Index: emacs.c
===================================================================
RCS file: /sources/emacs/emacs/src/emacs.c,v
retrieving revision 1.401.2.3
retrieving revision 1.401.2.4
diff -u -b -r1.401.2.3 -r1.401.2.4
--- emacs.c     29 Sep 2007 22:27:53 -0000      1.401.2.3
+++ emacs.c     29 Oct 2007 00:30:43 -0000      1.401.2.4
@@ -2467,7 +2467,7 @@
               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,
@@ -2506,9 +2506,8 @@
 
   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,