[Emacs-diffs] trunk r116808: * src/charset.c (init_charset): When we cannot find the charsets directory,

[Glenn Morris]

------------------------------------------------------------
revno: 116808
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2014-03-19 21:21:52 -0400
message:
  * src/charset.c (init_charset): When we cannot find the charsets directory,
  mention if EMACSDATA is set.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/charset.c                  charset.c-20091113204419-o5vbwnq5f7feedwu-1075

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-03-19 21:14:32 +0000
+++ b/src/ChangeLog     2014-03-20 01:21:52 +0000
@@ -1,3 +1,8 @@
+2014-03-20  Glenn Morris  <address@hidden>
+
+       * charset.c (init_charset): When we cannot find the charsets directory,
+       mention if EMACSDATA is set.
+
 2014-03-19  Paul Eggert  <address@hidden>
 
        * fns.c (Frandom): Fix rare bug where the result isn't random.

=== modified file 'src/charset.c'
--- a/src/charset.c     2014-01-01 07:43:34 +0000
+++ b/src/charset.c     2014-03-20 01:21:52 +0000
@@ -2305,9 +2305,11 @@
          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);
     }