Mercurial > emacs

comparison src/xdisp.c @ 83276:26c9034f3533

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from miles@gnu.org--gnu-2005 (patch 192-203) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-192 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-193 Use gdb-ui breakpoint faces on ttys too * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-194 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-195 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-196 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-197 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-198 Tweak gdb-ui breakpoint faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-199 Tweak gdb-ui breakpoint faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-200 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-201 Tweak info/.arch-inventory to identify info/.cvsignore as source * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-202 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-203 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-316
author Karoly Lorentey <lorentey@elte.hu>
date Wed, 23 Mar 2005 10:40:00 +0000
parents 48ba3f89c89f 9b2dec143458
children 2006100ee57e
comparison
equal deleted inserted replaced
83275:87d0734390da 83276:26c9034f3533
3720 return 0; 3720 return 0;
3721 3721
3722 if (CONSP (XCDR (XCDR (spec)))) 3722 if (CONSP (XCDR (XCDR (spec))))
3723 { 3723 {
3724 Lisp_Object face_name = XCAR (XCDR (XCDR (spec))); 3724 Lisp_Object face_name = XCAR (XCDR (XCDR (spec)));
3725 int face_id2 = lookup_named_face (it->f, face_name, 'A', 0); 3725 int face_id2 = lookup_derived_face (it->f, face_name,
3726 'A', FRINGE_FACE_ID, 0);
3726 if (face_id2 >= 0) 3727 if (face_id2 >= 0)
3727 face_id = face_id2; 3728 face_id = face_id2;
3728 } 3729 }
3729 3730
3730 /* Save current settings of IT so that we can restore them 3731 /* Save current settings of IT so that we can restore them