[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/charset.c,v
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/src/charset.c,v |
Date: |
Fri, 23 May 2008 12:48:45 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 08/05/23 12:48:45
Index: charset.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/charset.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -b -r1.160 -r1.161
--- charset.c 23 May 2008 10:13:25 -0000 1.160
+++ charset.c 23 May 2008 12:48:44 -0000 1.161
@@ -74,12 +74,14 @@
Lisp_Object Qeight_bit;
Lisp_Object Qiso_8859_1;
Lisp_Object Qunicode;
+Lisp_Object Qemacs;
/* The corresponding charsets. */
int charset_ascii;
int charset_eight_bit;
int charset_iso_8859_1;
int charset_unicode;
+int charset_emacs;
/* The other special charsets. */
int charset_jisx0201_roman;
@@ -1814,8 +1816,7 @@
if (NILP (charset_list))
charset_list = Vcharset_ordered_list;
- while (CONSP (charset_list)
- && ! EQ (charset_list, Vcharset_non_preferred_head))
+ while (CONSP (charset_list))
{
struct charset *charset = CHARSET_FROM_ID (XINT (XCAR (charset_list)));
unsigned code = ENCODE_CHAR (charset, c);
@@ -1827,8 +1828,11 @@
return charset;
}
charset_list = XCDR (charset_list);
+ if (c <= MAX_UNICODE_CHAR
+ && EQ (charset_list, Vcharset_non_preferred_head))
+ return CHARSET_FROM_ID (charset_unicode);
}
- return (c <= MAX_UNICODE_CHAR ? CHARSET_FROM_ID (charset_unicode)
+ return (c <= MAX_5_BYTE_CHAR ? CHARSET_FROM_ID (charset_emacs)
: CHARSET_FROM_ID (charset_eight_bit));
}
@@ -2073,6 +2077,7 @@
DEFSYM (Qascii, "ascii");
DEFSYM (Qunicode, "unicode");
+ DEFSYM (Qemacs, "emacs");
DEFSYM (Qeight_bit, "eight-bit");
DEFSYM (Qiso_8859_1, "iso-8859-1");
@@ -2154,6 +2159,9 @@
charset_unicode
= define_charset_internal (Qunicode, 3, "\x00\xFF\x00\xFF\x00\x10",
0, MAX_UNICODE_CHAR, -1, 0, -1, 1, 0, 0);
+ charset_emacs
+ = define_charset_internal (Qemacs, 3, "\x00\xFF\x00\xFF\x00\x3F",
+ 0, MAX_5_BYTE_CHAR, -1, 0, -1, 1, 1, 0);
charset_eight_bit
= define_charset_internal (Qeight_bit, 1, "\x80\xFF\x00\x00\x00\x00",
128, 255, -1, 0, -1, 0, 1,
- [Emacs-diffs] Changes to emacs/src/charset.c,v, Kenichi Handa, 2008/05/13
- [Emacs-diffs] Changes to emacs/src/charset.c,v, Glenn Morris, 2008/05/14
- [Emacs-diffs] Changes to emacs/src/charset.c,v, Juanma Barranquero, 2008/05/23
- [Emacs-diffs] Changes to emacs/src/charset.c,v,
Kenichi Handa <=
- [Emacs-diffs] Changes to emacs/src/charset.c,v, Stefan Monnier, 2008/05/30