From 8458d4c1692fc7b50fd1edc600daeccadff353a8 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 19 Mar 2009 00:46:35 +0000 Subject: [PATCH] (load_charset_map_from_file): When a mapfile can't be loaded, signal an error. --- src/ChangeLog | 5 +++++ src/charset.c | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 7d2f75d2534..29c29353cf3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-03-19 Kenichi Handa + + * charset.c (load_charset_map_from_file): When a mapfile can't be + loaded, signal an error. + 2009-03-18 Eli Zaretskii * dired.c (Ffile_attributes): Make sure UID and GID are always diff --git a/src/charset.c b/src/charset.c index fa3515b5443..27812759e65 100644 --- a/src/charset.c +++ b/src/charset.c @@ -522,10 +522,7 @@ load_charset_map_from_file (charset, mapfile, control_flag) unbind_to (count, Qnil); if (fd < 0 || ! (fp = fdopen (fd, "r"))) - { - add_to_log ("Failure in loading charset map: %S", mapfile, Qnil); - return; - } + error ("Failure in loading charset map: %S", SDATA (mapfile)); head = entries = ((struct charset_map_entries *) alloca (sizeof (struct charset_map_entries))); -- 2.39.5