Mercurial > hg > xemacs-beta

comparison src/faces.c @ 371:cc15677e0335 r21-2b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2b1
author cvs
date Mon, 13 Aug 2007 11:03:08 +0200
parents a4f53d9b3154
children 6240c7796c7a
comparison
equal deleted inserted replaced
370:bd866891f083 371:cc15677e0335
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 findex = get_merged_face_cache_index (w, &cachel); 1571 return 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;
1581 } 1572 }
1582 } 1573 }
1583 1574
1584 1575
1585 /***************************************************************************** 1576 /*****************************************************************************
1926 #ifdef HAVE_TTY 1917 #ifdef HAVE_TTY
1927 inst_list = Fcons (Fcons (list1 (Qtty), build_string ("normal")), 1918 inst_list = Fcons (Fcons (list1 (Qtty), build_string ("normal")),
1928 inst_list); 1919 inst_list);
1929 #endif /* HAVE_TTY */ 1920 #endif /* HAVE_TTY */
1930 #ifdef HAVE_MS_WINDOWS 1921 #ifdef HAVE_MS_WINDOWS
1931 inst_list = Fcons (Fcons (list1 (Qmswindows), 1922 inst_list = Fcons (Fcons (list1 (Qmswindows), build_string ("Courier New")),
1932 build_string ("Fixedsys:Regular:9::Western")), inst_list); 1923 inst_list);
1933 inst_list = Fcons (Fcons (list1 (Qmswindows),
1934 build_string ("Courier:Regular:10::Western")), inst_list);
1935 inst_list = Fcons (Fcons (list1 (Qmswindows),
1936 build_string ("Courier New:Regular:10::Western")), inst_list);
1937 #endif /* HAVE_MS_WINDOWS */ 1924 #endif /* HAVE_MS_WINDOWS */
1938 set_specifier_fallback (Fget (Vdefault_face, Qfont, Qnil), inst_list); 1925 set_specifier_fallback (Fget (Vdefault_face, Qfont, Qnil), inst_list);
1939 } 1926 }
1940 1927
1941 set_specifier_fallback (Fget (Vdefault_face, Qunderline, Qnil), 1928 set_specifier_fallback (Fget (Vdefault_face, Qunderline, Qnil),