From: Glenn Morris <rgm@gnu.org>
Date: Fri, 12 Sep 2008 03:11:38 +0000 (+0000)
Subject: (init_charset): Warn if etc/charsets not found.  (Bug#909)
X-Git-Tag: emacs-pretest-23.0.90~2915
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c8f94403424bc811ab2f7b8998648f936794476d;p=emacs.git

(init_charset): Warn if etc/charsets not found.  (Bug#909)
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e16899d101a..bef4d029e93 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-12  Glenn Morris  <rgm@gnu.org>
+
+	* charset.c (init_charset): Warn if etc/charsets not found.  (Bug#909)
+
 2008-09-11  Glenn Morris  <rgm@gnu.org>
 
 	* charset.c (charset-map-path): Doc fix.
diff --git a/src/charset.c b/src/charset.c
index 217f51b15fb..43155d2cc65 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1,6 +1,6 @@
 /* Basic character set support.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+     2008  Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
      2005, 2006, 2007, 2008
      National Institute of Advanced Industrial Science and Technology (AIST)
@@ -2044,9 +2044,18 @@ Return charset identification number of CHARSET.  */)
 void
 init_charset ()
 {
-  Vcharset_map_path
-    = Fcons (Fexpand_file_name (build_string ("charsets"), Vdata_directory),
-	     Qnil);
+  Lisp_Object tempdir;
+  tempdir = Fexpand_file_name (build_string ("charsets"), Vdata_directory);
+  if (access (SDATA (tempdir), 0) < 0)
+    {
+      dir_warning ("Error: charsets directory (%s) does not exist.\n\
+Emacs will not function correctly without the character map files.\n\
+Please check your installation!\n",
+                   tempdir);
+      /* TODO should this be a fatal error?  (Bug#909)  */
+    }
+
+  Vcharset_map_path = Fcons (tempdir, Qnil);
 }