From: Andreas Schwab <schwab@linux-m68k.org>
Date: Sat, 19 Dec 2009 09:57:22 +0000 (+0000)
Subject: (Fclear_font_cache): Pass correct cache argument to
X-Git-Tag: emacs-pretest-23.1.91~48
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7a6f7feaec2fce4366e34059ae57ce1881f38677;p=emacs.git

(Fclear_font_cache): Pass correct cache argument to
font_clear_cache.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0e1e60a25cc..efde5769673 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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
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,
 	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));