aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2011-08-23 10:41:07 -0400
committerChong Yidong2011-08-23 10:41:07 -0400
commit4a5885a74a3310ed4f4ba86eee3c406019b2c334 (patch)
tree615f428eba76a001f81af7017b5b6c8ec69934ad /src
parent821ff7208c4a8fb4b12a0ea8039006d2b2e57463 (diff)
downloademacs-4a5885a74a3310ed4f4ba86eee3c406019b2c334.tar.gz
emacs-4a5885a74a3310ed4f4ba86eee3c406019b2c334.zip
* src/nsfont.m (ns_otf_to_script): Fix typo.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/nsfont.m2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a3c7c2f09d2..e7d426f23fb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-08-23 Chong Yidong <cyd@stupidchicken.com>
2
3 * nsfont.m (ns_otf_to_script): Fix typo.
4
12011-08-22 Kenichi Handa <handa@m17n.org> 52011-08-22 Kenichi Handa <handa@m17n.org>
2 6
3 * chartab.c (Fset_char_table_extra_slot): Do not inhibit setting a 7 * chartab.c (Fset_char_table_extra_slot): Do not inhibit setting a
diff --git a/src/nsfont.m b/src/nsfont.m
index 60f8c5321aa..c4d9123faef 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -303,7 +303,7 @@ static NSString
303{ 303{
304 Lisp_Object script = assq_no_quit (XCAR (otf), Votf_script_alist); 304 Lisp_Object script = assq_no_quit (XCAR (otf), Votf_script_alist);
305 return CONSP (script) 305 return CONSP (script)
306 ? [NSString stringWithUTF8String: SDATA (SYMBOL_NAME XCDR ((script)))] 306 ? [NSString stringWithUTF8String: SDATA (SYMBOL_NAME (XCDR ((script))))]
307 : @""; 307 : @"";
308} 308}
309 309