[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108044: * src/charset.c (init_cha
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108044: * src/charset.c (init_charset): Make lack of etc/charsets fatal. |
Date: |
Thu, 21 Jun 2012 16:06:07 -0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108044
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Thu 2012-06-21 16:06:07 -0400
message:
* src/charset.c (init_charset): Make lack of etc/charsets fatal.
modified:
src/ChangeLog
src/charset.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-06-11 16:53:12 +0000
+++ b/src/ChangeLog 2012-06-21 20:06:07 +0000
@@ -1,3 +1,7 @@
+2012-06-21 Glenn Morris <address@hidden>
+
+ * charset.c (init_charset): Make lack of etc/charsets fatal.
+
2012-06-11 Jan Djärv <address@hidden>
* nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't
=== modified file 'src/charset.c'
--- a/src/charset.c 2012-05-28 16:50:10 +0000
+++ b/src/charset.c 2012-06-21 20:06:07 +0000
@@ -2304,11 +2304,15 @@
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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r108044: * src/charset.c (init_charset): Make lack of etc/charsets fatal.,
Glenn Morris <=