aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorXue Fuqiao2013-09-12 21:12:39 +0800
committerXue Fuqiao2013-09-12 21:12:39 +0800
commit15c6d837a554bd128c1d5ef7b46fd05d6eba52ab (patch)
tree3fb4b9d2224f9ebd696ca61581c9566cb95ff35d /src
parent99d8e6d6c226fd69f7a8927d89a485044bb9c0a3 (diff)
downloademacs-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/ChangeLog4
-rw-r--r--src/charset.c2
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 @@
12013-09-12 Xue Fuqiao <xfq.free@gmail.com>
2
3 * charset.c (char_charset): Document an exception for char-charset.
4
12013-09-12 Dmitry Antipov <dmantipov@yandex.ru> 52013-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
2054DEFUN ("char-charset", Fchar_charset, Schar_charset, 1, 2, 0, 2054DEFUN ("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.
2056ASCII characters are an exception: for them, this function always
2057returns `ascii'.
2056If optional 2nd arg RESTRICTION is non-nil, it is a list of charsets 2058If optional 2nd arg RESTRICTION is non-nil, it is a list of charsets
2057from which to find the charset. It may also be a coding system. In 2059from which to find the charset. It may also be a coding system. In
2058that case, find the charset from what supported by that coding system. */) 2060that case, find the charset from what supported by that coding system. */)