diff options
| author | Kenichi Handa | 2004-01-07 12:50:15 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2004-01-07 12:50:15 +0000 |
| commit | 74ac5074b46dbf6bf1796e1aa306fc36be8ea18c (patch) | |
| tree | b88ecb84c517f519295917ad634c768ec4df1027 /src | |
| parent | c251286b57fd9d477ea403ce7038fc47347e6282 (diff) | |
| download | emacs-74ac5074b46dbf6bf1796e1aa306fc36be8ea18c.tar.gz emacs-74ac5074b46dbf6bf1796e1aa306fc36be8ea18c.zip | |
(Fdeclare_equiv_charset): Fix docstring.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/charset.c | 21 |
2 files changed, 14 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 95000060b06..be56024fa04 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2004-01-07 Kenichi Handa <handa@m17n.org> | 1 | 2004-01-07 Kenichi Handa <handa@m17n.org> |
| 2 | 2 | ||
| 3 | * charset.c (Fdeclare_equiv_charset): Fix docstring. | ||
| 4 | |||
| 3 | * fontset.c (fontset_ref_via_base): Fix previous change. | 5 | * fontset.c (fontset_ref_via_base): Fix previous change. |
| 4 | 6 | ||
| 5 | 2004-01-07 Kim F. Storm <storm@cua.dk> | 7 | 2004-01-07 Kim F. Storm <storm@cua.dk> |
diff --git a/src/charset.c b/src/charset.c index 70152139352..48382a44bd6 100644 --- a/src/charset.c +++ b/src/charset.c | |||
| @@ -760,17 +760,20 @@ return nil. */) | |||
| 760 | 760 | ||
| 761 | DEFUN ("declare-equiv-charset", Fdeclare_equiv_charset, Sdeclare_equiv_charset, | 761 | DEFUN ("declare-equiv-charset", Fdeclare_equiv_charset, Sdeclare_equiv_charset, |
| 762 | 4, 4, 0, | 762 | 4, 4, 0, |
| 763 | doc: /* Declare a charset of DIMENSION, CHARS, FINAL-CHAR is the same as CHARSET. | 763 | doc: /* Declare an equivalent charset for ISO-2022 decoding. |
| 764 | CHARSET should be defined by `defined-charset' in advance. */) | 764 | |
| 765 | (dimension, chars, final_char, charset_symbol) | 765 | On decoding by an ISO-2022 base coding system, when a charset |
| 766 | Lisp_Object dimension, chars, final_char, charset_symbol; | 766 | specified by DIMENSION, CHARS, and FINAL-CHAR is designated, behave as |
| 767 | if CHARSET is designated instead. */) | ||
| 768 | (dimension, chars, final_char, charset) | ||
| 769 | Lisp_Object dimension, chars, final_char, charset; | ||
| 767 | { | 770 | { |
| 768 | int charset; | 771 | int charset_id; |
| 769 | 772 | ||
| 770 | CHECK_NUMBER (dimension); | 773 | CHECK_NUMBER (dimension); |
| 771 | CHECK_NUMBER (chars); | 774 | CHECK_NUMBER (chars); |
| 772 | CHECK_NUMBER (final_char); | 775 | CHECK_NUMBER (final_char); |
| 773 | CHECK_SYMBOL (charset_symbol); | 776 | CHECK_SYMBOL (charset); |
| 774 | 777 | ||
| 775 | if (XINT (dimension) != 1 && XINT (dimension) != 2) | 778 | if (XINT (dimension) != 1 && XINT (dimension) != 2) |
| 776 | error ("Invalid DIMENSION %d, it should be 1 or 2", XINT (dimension)); | 779 | error ("Invalid DIMENSION %d, it should be 1 or 2", XINT (dimension)); |
| @@ -778,10 +781,10 @@ CHARSET should be defined by `defined-charset' in advance. */) | |||
| 778 | error ("Invalid CHARS %d, it should be 94 or 96", XINT (chars)); | 781 | error ("Invalid CHARS %d, it should be 94 or 96", XINT (chars)); |
| 779 | if (XINT (final_char) < '0' || XFASTINT (final_char) > '~') | 782 | if (XINT (final_char) < '0' || XFASTINT (final_char) > '~') |
| 780 | error ("Invalid FINAL-CHAR %c, it should be `0'..`~'", XINT (chars)); | 783 | error ("Invalid FINAL-CHAR %c, it should be `0'..`~'", XINT (chars)); |
| 781 | if ((charset = get_charset_id (charset_symbol)) < 0) | 784 | if ((charset_id = get_charset_id (charset)) < 0) |
| 782 | error ("Invalid charset %s", SDATA (SYMBOL_NAME (charset_symbol))); | 785 | error ("Invalid charset %s", SDATA (SYMBOL_NAME (charset))); |
| 783 | 786 | ||
| 784 | ISO_CHARSET_TABLE (dimension, chars, final_char) = charset; | 787 | ISO_CHARSET_TABLE (dimension, chars, final_char) = charset_id; |
| 785 | return Qnil; | 788 | return Qnil; |
| 786 | } | 789 | } |
| 787 | 790 | ||