Mercurial > emacs
diff src/xdisp.c @ 83212:f70dc61a797f
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-581
Fix exec-shield autoconf test
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-582
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-583
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-584
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-585
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-586
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-587
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-588
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-589
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-590
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-591
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-592
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-38
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-39
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-40
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-41
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-252
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sun, 03 Oct 2004 13:08:55 +0000 |
| parents | b85b19b8eb65 4d3c89d6b88d |
| children | d83f49cefda3 |
line wrap: on
line diff
--- a/src/xdisp.c Wed Sep 29 08:38:15 2004 +0000 +++ b/src/xdisp.c Sun Oct 03 13:08:55 2004 +0000 @@ -307,7 +307,6 @@ extern Lisp_Object QCwidth, QCheight, QCascent; extern Lisp_Object Qscroll_bar; extern Lisp_Object Qcursor; -extern Lisp_Object Qfringe; /* Non-nil means highlight trailing whitespace. */ @@ -3565,6 +3564,7 @@ && CONSP (XCDR (prop))) { unsigned face_id = DEFAULT_FACE_ID; + int fringe_bitmap; /* Save current settings of IT so that we can restore them when we are finished with the glyph property value. */ @@ -3576,8 +3576,7 @@ #ifdef HAVE_WINDOW_SYSTEM value = XCAR (XCDR (prop)); if (!SYMBOLP (value) - || (value = Fget (value, Qfringe), - !valid_fringe_bitmap_p (value))) + || !(fringe_bitmap = lookup_fringe_bitmap (value))) return 0; if (CONSP (XCDR (XCDR (prop)))) @@ -3606,12 +3605,12 @@ if (EQ (XCAR (prop), Qleft_fringe)) { - it->left_user_fringe_bitmap = XINT (value); + it->left_user_fringe_bitmap = fringe_bitmap; it->left_user_fringe_face_id = face_id; } else { - it->right_user_fringe_bitmap = XINT (value); + it->right_user_fringe_bitmap = fringe_bitmap; it->right_user_fringe_face_id = face_id; } #endif /* HAVE_WINDOW_SYSTEM */