projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add some missing mappings to CHINA3-JEF code points.
[chise/xemacs-chise.git]
/
src
/
mule-charset.c
diff --git
a/src/mule-charset.c
b/src/mule-charset.c
index
dd79320
..
2031052
100644
(file)
--- a/
src/mule-charset.c
+++ b/
src/mule-charset.c
@@
-1045,7
+1045,7
@@
decode_builtin_char (Lisp_Object charset, int code_point)
}
int
}
int
-charset_code_point (Lisp_Object charset, Emchar ch)
+charset_code_point (Lisp_Object charset, Emchar ch, int defined_only)
{
Lisp_Object encoding_table = XCHARSET_ENCODING_TABLE (charset);
Lisp_Object ret;
{
Lisp_Object encoding_table = XCHARSET_ENCODING_TABLE (charset);
Lisp_Object ret;
@@
-1062,7
+1062,9
@@
charset_code_point (Lisp_Object charset, Emchar ch)
int code;
if ( CHARSETP (mother) )
int code;
if ( CHARSETP (mother) )
- code = charset_code_point (mother, ch);
+ code = charset_code_point (mother, ch, defined_only);
+ else if (defined_only)
+ return -1;
else
code = ch;
if ( ((max == 0) && CHARSETP (mother)) ||
else
code = ch;
if ( ((max == 0) && CHARSETP (mother)) ||
@@
-2202,16
+2204,17
@@
N defaults to 0 if omitted.
}
#ifdef UTF2000
}
#ifdef UTF2000
-DEFUN ("encode-char", Fencode_char, 2, 2, 0, /*
+DEFUN ("encode-char", Fencode_char, 2, 3, 0, /*
Return code-point of CHARACTER in specified CHARSET.
*/
Return code-point of CHARACTER in specified CHARSET.
*/
- (character, charset))
+ (character, charset, defined_only))
{
int code_point;
CHECK_CHAR_COERCE_INT (character);
charset = Fget_charset (charset);
{
int code_point;
CHECK_CHAR_COERCE_INT (character);
charset = Fget_charset (charset);
- code_point = charset_code_point (charset, XCHAR (character));
+ code_point = charset_code_point (charset, XCHAR (character),
+ !NILP (defined_only));
if (code_point >= 0)
return make_int (code_point);
else
if (code_point >= 0)
return make_int (code_point);
else