andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Glenn Morris 2008-09-12 03:11:38 +00:00
parent 8359634804
commit c8f9440342
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -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.

19
src/charset.c
View file

@ -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);
}