[Emacs-diffs] /srv/bzr/emacs/trunk r106835: * src/emacs.c (syms_of_emacs) <installation-directory>: Doc fix.

[Glenn Morris]

------------------------------------------------------------
revno: 106835
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-01-10 15:37:10 -0500
message:
  * src/emacs.c (syms_of_emacs) <installation-directory>: Doc fix.
  
  This confusingly-named variable is typically nil in an installed Emacs,
  and in an uninstalled Emacs points to the build directory, rather
  than eg the target installation directory.  Yay.
modified:
  src/ChangeLog
  src/emacs.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-01-10 17:32:19 +0000
+++ b/src/ChangeLog     2012-01-10 20:37:10 +0000
@@ -1,5 +1,7 @@
 2012-01-10  Glenn Morris  <address@hidden>
 
+       * emacs.c (syms_of_emacs) <installation-directory>: Doc fix.
+
        * epaths.in (PATH_LOADSEARCH, PATH_EXEC, PATH_DATA, PATH_DOC):
        Update template values to be closer to their typical values these days.
 

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2012-01-05 09:46:05 +0000
+++ b/src/emacs.c       2012-01-10 20:37:10 +0000
@@ -2480,9 +2480,11 @@
 
   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.  */);
+In an installed Emacs, this is normally nil.  It is non-nil if
+both `lib-src' (on MS-DOS, `info') and `etc' directories are found
+within `invocation-directory' or its parent.  For example, this
+is the case when running an uninstalled Emacs executable from its
+build directory.  */);
   Vinstallation_directory = Qnil;
 
   DEFVAR_LISP ("system-messages-locale", Vsystem_messages_locale,