diff options
| author | Paul Eggert | 2011-12-10 16:56:50 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-12-10 16:56:50 -0800 |
| commit | 8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (patch) | |
| tree | c8129448cbbf387fe82667ccac02983592c688f1 /src/charset.c | |
| parent | 85a83e2e2585a1906dec5168ed96ad521b5849ed (diff) | |
| parent | 7b9d523a07395ecea505be88f45c33d73aea7038 (diff) | |
| download | emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.tar.gz emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.zip | |
Merge from trunk.
Diffstat (limited to 'src/charset.c')
| -rw-r--r-- | src/charset.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/charset.c b/src/charset.c index 8f16771b855..ec90a64341e 100644 --- a/src/charset.c +++ b/src/charset.c | |||
| @@ -167,9 +167,9 @@ static struct | |||
| 167 | maximum character of the current charset. */ | 167 | maximum character of the current charset. */ |
| 168 | int min_char, max_char; | 168 | int min_char, max_char; |
| 169 | 169 | ||
| 170 | /* A Unicode character correspoinding to the code indice 0 (i.e. the | 170 | /* A Unicode character corresponding to the code index 0 (i.e. the |
| 171 | minimum code-point) of the current charset, or -1 if the code | 171 | minimum code-point) of the current charset, or -1 if the code |
| 172 | indice 0 is not a Unicode character. This is checked when | 172 | index 0 is not a Unicode character. This is checked when |
| 173 | table.encoder[CHAR] is zero. */ | 173 | table.encoder[CHAR] is zero. */ |
| 174 | int zero_index_char; | 174 | int zero_index_char; |
| 175 | 175 | ||
| @@ -2074,7 +2074,7 @@ that case, find the charset from what supported by that coding system. */) | |||
| 2074 | DEFUN ("charset-after", Fcharset_after, Scharset_after, 0, 1, 0, | 2074 | DEFUN ("charset-after", Fcharset_after, Scharset_after, 0, 1, 0, |
| 2075 | doc: /* | 2075 | doc: /* |
| 2076 | Return charset of a character in the current buffer at position POS. | 2076 | Return charset of a character in the current buffer at position POS. |
| 2077 | If POS is nil, it defauls to the current point. | 2077 | If POS is nil, it defaults to the current point. |
| 2078 | If POS is out of range, the value is nil. */) | 2078 | If POS is out of range, the value is nil. */) |
| 2079 | (Lisp_Object pos) | 2079 | (Lisp_Object pos) |
| 2080 | { | 2080 | { |