changeset 106618:431b202f351d

(Fclear_font_cache): Pass correct cache argument to font_clear_cache.
author Andreas Schwab <schwab@linux-m68k.org>
date Sat, 19 Dec 2009 09:57:22 +0000
parents 78f92ffeb7ab
children 528f9cf7298f
files src/ChangeLog src/font.c
diffstat 2 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Fri Dec 18 19:35:14 2009 +0000
+++ b/src/ChangeLog	Sat Dec 19 09:57:22 2009 +0000
@@ -1,3 +1,8 @@
+2009-12-19  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* font.c (Fclear_font_cache): Pass correct cache argument to
+	font_clear_cache.
+
 2009-12-16  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* Makefile.in (prefix-args${EXEEXT}): Don't compile prefix-args.c
--- a/src/font.c	Fri Dec 18 19:35:14 2009 +0000
+++ b/src/font.c	Sat Dec 19 09:57:22 2009 +0000
@@ -4479,15 +4479,15 @@
 	if (driver_list->on)
 	  {
 	    Lisp_Object cache = driver_list->driver->get_cache (f);
-	    Lisp_Object val;
+	    Lisp_Object val, tmp;
 
 	    val = XCDR (cache);
 	    while (! NILP (val)
 		   && ! EQ (XCAR (XCAR (val)), driver_list->driver->type))
 	      val = XCDR (val);
 	    font_assert (! NILP (val));
-	    val = XCDR (XCAR (val));
-	    if (XINT (XCAR (val)) == 0)
+	    tmp = XCDR (XCAR (val));
+	    if (XINT (XCAR (tmp)) == 0)
 	      {
 		font_clear_cache (f, XCAR (val), driver_list->driver);
 		XSETCDR (cache, XCDR (val));