aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2011-02-08 15:56:57 +0900
committerKenichi Handa2011-02-08 15:56:57 +0900
commit8f3b2e120bdb6226d36e8d3241551ea740dfc8cc (patch)
treed7b3e2a5a408c52663ddc72c1e22b12abc720e35 /src
parent50c822bd67a6bc27d75398696953be05bddde223 (diff)
downloademacs-8f3b2e120bdb6226d36e8d3241551ea740dfc8cc.tar.gz
emacs-8f3b2e120bdb6226d36e8d3241551ea740dfc8cc.zip
font.c (Ffont_get): Do not cache :otf value.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/font.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 24ec9ce43cd..75f673b532c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-02-08 Kenichi Handa <handa@m17n.org>
2
3 * font.c (Ffont_get): Do not cache :otf value.
4
12011-02-07 Paul Eggert <eggert@cs.ucla.edu> 52011-02-07 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 conform to C89 pointer rules 7 conform to C89 pointer rules
diff --git a/src/font.c b/src/font.c
index 394c0055328..841125a0587 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3982,7 +3982,6 @@ Layout tags. */)
3982 val = fontp->driver->otf_capability (fontp); 3982 val = fontp->driver->otf_capability (fontp);
3983 else 3983 else
3984 val = Fcons (Qnil, Qnil); 3984 val = Fcons (Qnil, Qnil);
3985 font_put_extra (font, QCotf, val);
3986 } 3985 }
3987 else 3986 else
3988 val = Fcdr (val); 3987 val = Fcdr (val);