Mercurial > emacs
diff src/xdisp.c @ 83276:26c9034f3533
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 |
line wrap: on
line diff
--- a/src/xdisp.c Tue Mar 22 17:58:23 2005 +0000 +++ b/src/xdisp.c Wed Mar 23 10:40:00 2005 +0000 @@ -3722,7 +3722,8 @@ if (CONSP (XCDR (XCDR (spec)))) { Lisp_Object face_name = XCAR (XCDR (XCDR (spec))); - int face_id2 = lookup_named_face (it->f, face_name, 'A', 0); + int face_id2 = lookup_derived_face (it->f, face_name, + 'A', FRINGE_FACE_ID, 0); if (face_id2 >= 0) face_id = face_id2; }