aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2009-01-28 06:45:07 +0000
committerKenichi Handa2009-01-28 06:45:07 +0000
commit9fe788041ce00d291931fe6cc685526949a50990 (patch)
treec3674f0e35a88b79a21c5cab0642faa1e4af60a6 /src
parent685b54793282db07cba9a78ee918070983f89227 (diff)
downloademacs-9fe788041ce00d291931fe6cc685526949a50990.tar.gz
emacs-9fe788041ce00d291931fe6cc685526949a50990.zip
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/fontset.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 050b0c20efe..9b359f166c3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12009-01-28 Kenichi Handa <handa@m17n.org>
2
3 * fontset.c (font_for_char): Use assq_no_quit, not assoc_no_quit.
4
12009-01-27 Chong Yidong <cyd@stupidchicken.com> 52009-01-27 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * fns.c (concat): Check for string overflow (bug#1787). 7 * fns.c (concat): Check for string overflow (bug#1787).
diff --git a/src/fontset.c b/src/fontset.c
index 2eabef8cfc0..b69c650c7c5 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -970,7 +970,7 @@ font_for_char (face, c, pos, object)
970 { 970 {
971 Lisp_Object val; 971 Lisp_Object val;
972 972
973 val = assoc_no_quit (charset, Vfont_encoding_charset_alist); 973 val = assq_no_quit (charset, Vfont_encoding_charset_alist);
974 if (CONSP (val) && CHARSETP (XCDR (val))) 974 if (CONSP (val) && CHARSETP (XCDR (val)))
975 charset = XCDR (val); 975 charset = XCDR (val);
976 id = XINT (CHARSET_SYMBOL_ID (charset)); 976 id = XINT (CHARSET_SYMBOL_ID (charset));