diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-03-19 21:21:52 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-03-19 21:21:52 -0400 |
| commit | 7b9cb5448748b75a15840b7fba080cdcb341d0f7 (patch) | |
| tree | ab0fee06ab6bb8c400ddf68ba5a21c69a1b7323f | |
| parent | f15ec1bac8671507b24e62aaea47f4796bcef267 (diff) | |
| download | emacs-7b9cb5448748b75a15840b7fba080cdcb341d0f7.tar.gz | |
* src/charset.c (init_charset): When we cannot find the charsets directory,
mention if EMACSDATA is set.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/charset.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f7f4a5f03b2..3256a92e37a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-03-20 Glenn Morris <rgm@gnu.org> + + * charset.c (init_charset): When we cannot find the charsets directory, + mention if EMACSDATA is set. + 2014-03-19 Paul Eggert <eggert@cs.ucla.edu> * fns.c (Frandom): Fix rare bug where the result isn't random. diff --git a/src/charset.c b/src/charset.c index 7935ff9382b..3566b156736 100644 --- a/src/charset.c +++ b/src/charset.c @@ -2305,9 +2305,11 @@ init_charset (void) obscure problem (eg bug#6401), so better abort. */ fprintf (stderr, "Error: charsets directory not found:\n\ %s\n\ -Emacs will not function correctly without the character map files.\n\ +Emacs will not function correctly without the character map files.\n%s\ Please check your installation!\n", - SDATA (tempdir)); + SDATA (tempdir), + egetenv("EMACSDATA") ? "The EMACSDATA environment \ +variable is set, maybe it has the wrong value?\n" : ""); exit (1); } |