aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2009-12-19 09:57:22 +0000
committerAndreas Schwab2009-12-19 09:57:22 +0000
commit7a6f7feaec2fce4366e34059ae57ce1881f38677 (patch)
tree67952549868315c827ec1b73c566df6082d9d2ec /src
parent6fe539d246f75dbba74b95a5ace37ea8ce91e3dd (diff)
downloademacs-7a6f7feaec2fce4366e34059ae57ce1881f38677.tar.gz
emacs-7a6f7feaec2fce4366e34059ae57ce1881f38677.zip
(Fclear_font_cache): Pass correct cache argument to
font_clear_cache.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/font.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0e1e60a25cc..efde5769673 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12009-12-19 Andreas Schwab <schwab@linux-m68k.org>
2
3 * font.c (Fclear_font_cache): Pass correct cache argument to
4 font_clear_cache.
5
12009-12-16 Andreas Schwab <schwab@linux-m68k.org> 62009-12-16 Andreas Schwab <schwab@linux-m68k.org>
2 7
3 * Makefile.in (prefix-args${EXEEXT}): Don't compile prefix-args.c 8 * Makefile.in (prefix-args${EXEEXT}): Don't compile prefix-args.c
diff --git a/src/font.c b/src/font.c
index e9ae85a9766..3a8f73a6b03 100644
--- a/src/font.c
+++ b/src/font.c
@@ -4479,15 +4479,15 @@ DEFUN ("clear-font-cache", Fclear_font_cache, Sclear_font_cache, 0, 0, 0,
4479 if (driver_list->on) 4479 if (driver_list->on)
4480 { 4480 {
4481 Lisp_Object cache = driver_list->driver->get_cache (f); 4481 Lisp_Object cache = driver_list->driver->get_cache (f);
4482 Lisp_Object val; 4482 Lisp_Object val, tmp;
4483 4483
4484 val = XCDR (cache); 4484 val = XCDR (cache);
4485 while (! NILP (val) 4485 while (! NILP (val)
4486 && ! EQ (XCAR (XCAR (val)), driver_list->driver->type)) 4486 && ! EQ (XCAR (XCAR (val)), driver_list->driver->type))
4487 val = XCDR (val); 4487 val = XCDR (val);
4488 font_assert (! NILP (val)); 4488 font_assert (! NILP (val));
4489 val = XCDR (XCAR (val)); 4489 tmp = XCDR (XCAR (val));
4490 if (XINT (XCAR (val)) == 0) 4490 if (XINT (XCAR (tmp)) == 0)
4491 { 4491 {
4492 font_clear_cache (f, XCAR (val), driver_list->driver); 4492 font_clear_cache (f, XCAR (val), driver_list->driver);
4493 XSETCDR (cache, XCDR (val)); 4493 XSETCDR (cache, XCDR (val));