[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src charset.c
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] emacs/src charset.c |
Date: |
Sat, 29 Nov 2008 01:45:24 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 08/11/29 01:45:24
Modified files:
src : charset.c
Log message:
(Fdefine_charset_internal): After calculating
min_char, max_char, and fastmap, copy the charset structure again.
(encode_char): Fix the previous change.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/charset.c?cvsroot=emacs&r1=1.166&r2=1.167
Patches:
Index: charset.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/charset.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -b -r1.166 -r1.167
--- charset.c 27 Nov 2008 08:00:16 -0000 1.166
+++ charset.c 29 Nov 2008 01:45:23 -0000 1.167
@@ -1199,7 +1199,10 @@
charset_table[id] = charset;
if (charset.method == CHARSET_METHOD_MAP)
+ {
load_charset (&charset, 0);
+ charset_table[id] = charset;
+ }
if (charset.iso_final >= 0)
{
@@ -1855,8 +1858,11 @@
encoder = CHARSET_ENCODER (charset);
if (! CHAR_TABLE_P (CHARSET_ENCODER (charset)))
- load_charset (charset);
- if (CHAR_TABLE_P (CHARSET_ENCODER (charset)))
+ {
+ load_charset (charset, 2);
+ encoder = CHARSET_ENCODER (charset);
+ }
+ if (CHAR_TABLE_P (encoder))
{
val = CHAR_TABLE_REF (encoder, c);
if (NILP (val))