* src/charset.c (init_charset): When we cannot find the charsets directory,

mention if EMACSDATA is set.

diff --git a/src/ChangeLog b/src/ChangeLog
index f7f4a5f03b267a34d4c5d7e89a01b2e19c21bb06..3256a92e37a392b4daba5d0b8213fb02cd1f9349 100644 (file)
--- 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 7935ff9382b1ecbafce5d5ffafa66b990598b6a8..3566b156736939053160394e0e1e563717323980 100644 (file)
--- 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);
     }