diff options
| author | Glenn Morris <[email protected]> | 2012-01-10 15:37:10 -0500 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2012-01-10 15:37:10 -0500 |
| commit | 74cc8ff926ea050855f36d0112f4d8e865336dfb (patch) | |
| tree | 246eeb2648be3a0cede6b5ec1fc5a7f9fd8adf83 /src | |
| parent | cd394be17755d8248ba01ea7ba8502a31f1ce71a (diff) | |
* 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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/emacs.c | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 83e703e80a..e359924e8f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2012-01-10 Glenn Morris <[email protected]> + * 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. diff --git a/src/emacs.c b/src/emacs.c index 459fe4ec92..d0c99bd6df 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -2480,9 +2480,11 @@ 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. */); +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, |