Mercurial > hg > xemacs-beta

comparison src/faces.c @ 367:a4f53d9b3154 r21-1-13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-1-13
author cvs
date Mon, 13 Aug 2007 11:01:07 +0200
parents afd57c14dfc8
children cc15677e0335
comparison
equal deleted inserted replaced
366:83d76f480a59 367:a4f53d9b3154
1566 1566
1567 /* Now finally merge in the default face. */ 1567 /* Now finally merge in the default face. */
1568 findex = get_builtin_face_cache_index (w, Vdefault_face); 1568 findex = get_builtin_face_cache_index (w, Vdefault_face);
1569 merge_face_cachel_data (w, findex, &cachel); 1569 merge_face_cachel_data (w, findex, &cachel);
1570 1570
1571 return get_merged_face_cache_index (w, &cachel); 1571 findex = get_merged_face_cache_index (w, &cachel);
1572 if (cachel.merged_faces &&
1573 /* merged_faces did not get stored and available via return value */
1574 Dynarr_at (w->face_cachels, findex).merged_faces !=
1575 cachel.merged_faces)
1576 {
1577 Dynarr_free (cachel.merged_faces);
1578 cachel.merged_faces = 0;
1579 }
1580 return findex;
1572 } 1581 }
1573 } 1582 }
1574 1583
1575 1584
1576 /***************************************************************************** 1585 /*****************************************************************************