diff options
| author | Kenichi Handa | 2000-12-21 00:12:13 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2000-12-21 00:12:13 +0000 |
| commit | 3073601217d7ec1536d90c4586dcc3b740096765 (patch) | |
| tree | c75a720dbf1fa9d6d7e0c7aa2208138f460ec524 | |
| parent | 3f9d67a6d4064492b079510df385fb2d87de30b1 (diff) | |
| download | emacs-3073601217d7ec1536d90c4586dcc3b740096765.tar.gz emacs-3073601217d7ec1536d90c4586dcc3b740096765.zip | |
(Fmake_char_internal): If CHARSET doesn't have a
generic character and CODE1 is nil, return the smallest character
in CHARSET.
| -rw-r--r-- | src/charset.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/charset.c b/src/charset.c index 58123244486..21583c8e8c3 100644 --- a/src/charset.c +++ b/src/charset.c | |||
| @@ -967,13 +967,17 @@ DEFUN ("make-char-internal", Fmake_char_internal, Smake_char_internal, 1, 3, 0, | |||
| 967 | } | 967 | } |
| 968 | else if (charset_id == CHARSET_8_BIT_CONTROL) | 968 | else if (charset_id == CHARSET_8_BIT_CONTROL) |
| 969 | { | 969 | { |
| 970 | if (c1 < 0x80 || c1 > 0x9F) | 970 | if (NILP (code1)) |
| 971 | c1 = 0x80; | ||
| 972 | else if (c1 < 0x80 || c1 > 0x9F) | ||
| 971 | goto invalid_code_posints; | 973 | goto invalid_code_posints; |
| 972 | return make_number (c1); | 974 | return make_number (c1); |
| 973 | } | 975 | } |
| 974 | else if (charset_id == CHARSET_8_BIT_GRAPHIC) | 976 | else if (charset_id == CHARSET_8_BIT_GRAPHIC) |
| 975 | { | 977 | { |
| 976 | if (c1 < 0xA0 || c1 > 0xFF) | 978 | if (NILP (code1)) |
| 979 | c1 = 0xA0; | ||
| 980 | else if (c1 < 0xA0 || c1 > 0xFF) | ||
| 977 | goto invalid_code_posints; | 981 | goto invalid_code_posints; |
| 978 | return make_number (c1); | 982 | return make_number (c1); |
| 979 | } | 983 | } |