aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2004-09-28 23:02:41 +0000
committerKim F. Storm2004-09-28 23:02:41 +0000
commitdb25ed416c7944021e8afc66f38de8131a1d9a7c (patch)
tree8c142c7cc58ee7c26024897a2a7db06080286655 /src
parentba55e59fd94798ae9b30b38c198a0571bbad2e80 (diff)
downloademacs-db25ed416c7944021e8afc66f38de8131a1d9a7c.tar.gz
emacs-db25ed416c7944021e8afc66f38de8131a1d9a7c.zip
(handle_single_display_prop): Fringe bitmaps are now
symbols with a fringe property.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 874f1951256..2577bc46efb 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -307,6 +307,7 @@ extern Lisp_Object Qheight;
307extern Lisp_Object QCwidth, QCheight, QCascent; 307extern Lisp_Object QCwidth, QCheight, QCascent;
308extern Lisp_Object Qscroll_bar; 308extern Lisp_Object Qscroll_bar;
309extern Lisp_Object Qcursor; 309extern Lisp_Object Qcursor;
310extern Lisp_Object Qfringe;
310 311
311/* Non-nil means highlight trailing whitespace. */ 312/* Non-nil means highlight trailing whitespace. */
312 313
@@ -3578,8 +3579,9 @@ handle_single_display_prop (it, prop, object, position,
3578 3579
3579#ifdef HAVE_WINDOW_SYSTEM 3580#ifdef HAVE_WINDOW_SYSTEM
3580 value = XCAR (XCDR (prop)); 3581 value = XCAR (XCDR (prop));
3581 if (!NUMBERP (value) 3582 if (!SYMBOLP (value)
3582 || !valid_fringe_bitmap_id_p (XINT (value))) 3583 || (value = Fget (value, Qfringe),
3584 !valid_fringe_bitmap_p (value)))
3583 return 0; 3585 return 0;
3584 3586
3585 if (CONSP (XCDR (XCDR (prop)))) 3587 if (CONSP (XCDR (XCDR (prop))))