diff options
| author | Xue Fuqiao | 2013-09-12 21:12:39 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-09-12 21:12:39 +0800 |
| commit | 15c6d837a554bd128c1d5ef7b46fd05d6eba52ab (patch) | |
| tree | 3fb4b9d2224f9ebd696ca61581c9566cb95ff35d /src | |
| parent | 99d8e6d6c226fd69f7a8927d89a485044bb9c0a3 (diff) | |
| download | emacs-15c6d837a554bd128c1d5ef7b46fd05d6eba52ab.tar.gz emacs-15c6d837a554bd128c1d5ef7b46fd05d6eba52ab.zip | |
* src/charset.c (char_charset): Document an exception for char-charset.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/charset.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 069a9885b4c..b4d1c2b67df 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-09-12 Xue Fuqiao <xfq.free@gmail.com> | ||
| 2 | |||
| 3 | * charset.c (char_charset): Document an exception for char-charset. | ||
| 4 | |||
| 1 | 2013-09-12 Dmitry Antipov <dmantipov@yandex.ru> | 5 | 2013-09-12 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 6 | ||
| 3 | * xterm.h (x_display_info): New field last_user_time... | 7 | * xterm.h (x_display_info): New field last_user_time... |
diff --git a/src/charset.c b/src/charset.c index eedf65faa6c..d46cb445f85 100644 --- a/src/charset.c +++ b/src/charset.c | |||
| @@ -2053,6 +2053,8 @@ CH in the charset. */) | |||
| 2053 | 2053 | ||
| 2054 | DEFUN ("char-charset", Fchar_charset, Schar_charset, 1, 2, 0, | 2054 | DEFUN ("char-charset", Fchar_charset, Schar_charset, 1, 2, 0, |
| 2055 | doc: /* Return the charset of highest priority that contains CH. | 2055 | doc: /* Return the charset of highest priority that contains CH. |
| 2056 | ASCII characters are an exception: for them, this function always | ||
| 2057 | returns `ascii'. | ||
| 2056 | If optional 2nd arg RESTRICTION is non-nil, it is a list of charsets | 2058 | If optional 2nd arg RESTRICTION is non-nil, it is a list of charsets |
| 2057 | from which to find the charset. It may also be a coding system. In | 2059 | from which to find the charset. It may also be a coding system. In |
| 2058 | that case, find the charset from what supported by that coding system. */) | 2060 | that case, find the charset from what supported by that coding system. */) |