procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* src/charset.c (init_charset): Make lack of etc/charsets fatal.

Browse source
This commit is contained in:
Glenn Morris 2012-06-21 16:06:07 -04:00
parent dd7a987e45
commit 63541ed886
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2012-06-21 Glenn Morris <rgm@gnu.org>
* charset.c (init_charset): Make lack of etc/charsets fatal.
2012-06-11 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't

10
src/charset.c
View file

@ -2304,11 +2304,15 @@ init_charset (void)
tempdir = Fexpand_file_name (build_string ("charsets"), Vdata_directory);
if (access (SSDATA (tempdir), 0) < 0)
{
dir_warning ("Error: charsets directory (%s) does not exist.\n\
/* This used to be non-fatal (dir_warning), but it should not
happen, and if it does sooner or later it will cause some
obscure problem (eg bug#909), so better abort. */
fprintf (stderr, "Error: charsets directory not found:\n\
%s\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) */
SDATA (tempdir));
exit (1);
}
Vcharset_map_path = Fcons (tempdir, Qnil);