[Emacs-diffs] Changes to emacs/src/w32uniscribe.c,v

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   08/04/04 12:07:55

Index: w32uniscribe.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32uniscribe.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- w32uniscribe.c      4 Apr 2008 11:59:09 -0000       1.4
+++ w32uniscribe.c      4 Apr 2008 12:07:54 -0000       1.5
@@ -612,7 +612,6 @@
       unsigned short script_table, langsys_table, n_langs;
       unsigned short feature_index, n_features;
       DWORD tbl = feature_tables[i];
-      Lisp_Object feature;
 
       /* Skip if no features requested from this table.  */
       if (NILP (features[i]))
@@ -680,10 +679,9 @@
       /* Check the features.  Features may contain nil according to
         documentation in font_prop_validate_otf, so count them.  */
       n_match_features = 0;
-      rest = features[i];
-      for (feature = XCAR (rest); CONSP (rest); feature = CAR_SAFE (rest))
+      for (rest = features[i]; CONSP (rest); rest = XCDR (rest))
        {
-         rest = XCDR (rest);
+         Lisp_Object feature = XCAR (rest);
          if (!NILP (feature))
            n_match_features++;
        }