diff options
| -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 83e703e80a1..e359924e8f7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2012-01-10 Glenn Morris <rgm@gnu.org> | 1 | 2012-01-10 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * emacs.c (syms_of_emacs) <installation-directory>: Doc fix. | ||
| 4 | |||
| 3 | * epaths.in (PATH_LOADSEARCH, PATH_EXEC, PATH_DATA, PATH_DOC): | 5 | * epaths.in (PATH_LOADSEARCH, PATH_EXEC, PATH_DATA, PATH_DOC): |
| 4 | Update template values to be closer to their typical values these days. | 6 | Update template values to be closer to their typical values these days. |
| 5 | 7 | ||
diff --git a/src/emacs.c b/src/emacs.c index 459fe4ec92a..d0c99bd6dff 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. */); | |||
| 2480 | 2480 | ||
| 2481 | DEFVAR_LISP ("installation-directory", Vinstallation_directory, | 2481 | DEFVAR_LISP ("installation-directory", Vinstallation_directory, |
| 2482 | doc: /* A directory within which to look for the `lib-src' and `etc' directories. | 2482 | doc: /* A directory within which to look for the `lib-src' and `etc' directories. |
| 2483 | This is non-nil when we can't find those directories in their standard | 2483 | In an installed Emacs, this is normally nil. It is non-nil if |
| 2484 | installed locations, but we can find them near where the Emacs executable | 2484 | both `lib-src' (on MS-DOS, `info') and `etc' directories are found |
| 2485 | was found. */); | 2485 | within `invocation-directory' or its parent. For example, this |
| 2486 | is the case when running an uninstalled Emacs executable from its | ||
| 2487 | build directory. */); | ||
| 2486 | Vinstallation_directory = Qnil; | 2488 | Vinstallation_directory = Qnil; |
| 2487 | 2489 | ||
| 2488 | DEFVAR_LISP ("system-messages-locale", Vsystem_messages_locale, | 2490 | DEFVAR_LISP ("system-messages-locale", Vsystem_messages_locale, |