[Emacs-diffs] emacs/src ChangeLog font.c

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 09/12/19 09:57:23

Modified files:
        src            : ChangeLog font.c 

Log message:
        (Fclear_font_cache): Pass correct cache argument to
        font_clear_cache.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7929&r2=1.7930
http://cvs.savannah.gnu.org/viewcvs/emacs/src/font.c?cvsroot=emacs&r1=1.148&r2=1.149

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7929
retrieving revision 1.7930
diff -u -b -r1.7929 -r1.7930
--- ChangeLog   17 Dec 2009 00:03:51 -0000      1.7929
+++ ChangeLog   19 Dec 2009 09:57:22 -0000      1.7930
@@ -1,3 +1,8 @@
+2009-12-19  Andreas Schwab  <address@hidden>
+
+       * font.c (Fclear_font_cache): Pass correct cache argument to
+       font_clear_cache.
+
 2009-12-16  Andreas Schwab  <address@hidden>
 
        * Makefile.in (prefix-args${EXEEXT}): Don't compile prefix-args.c

Index: font.c
===================================================================
RCS file: /sources/emacs/emacs/src/font.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -b -r1.148 -r1.149
--- font.c      5 Dec 2009 20:09:49 -0000       1.148
+++ font.c      19 Dec 2009 09:57:23 -0000      1.149
@@ -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));