aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2005-03-29 22:28:27 +0000
committerKim F. Storm2005-03-29 22:28:27 +0000
commit39df553f4d983f57c83fcca5c3f6ccd6e9d24c06 (patch)
treed74fb1e0b7b29dbe7480d269bae4dc1228dad1b8 /src
parentc364fe1954f1266e3f59df49a2de731a790551cf (diff)
downloademacs-39df553f4d983f57c83fcca5c3f6ccd6e9d24c06.tar.gz
emacs-39df553f4d983f57c83fcca5c3f6ccd6e9d24c06.zip
(display_line): Allow multiple overlay arrows in window.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index fdaf2bf1a3c..d463a3d7fcd 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -462,7 +462,7 @@ static Lisp_Object Vwindow_size_change_functions;
462 462
463Lisp_Object Qmenu_bar_update_hook, Vmenu_bar_update_hook; 463Lisp_Object Qmenu_bar_update_hook, Vmenu_bar_update_hook;
464 464
465/* Nonzero if overlay arrow has been displayed once in this window. */ 465/* Nonzero if an overlay arrow has been displayed in this window. */
466 466
467static int overlay_arrow_seen; 467static int overlay_arrow_seen;
468 468
@@ -15261,10 +15261,9 @@ display_line (it)
15261 mark this glyph row as the one containing the overlay arrow. 15261 mark this glyph row as the one containing the overlay arrow.
15262 This is clearly a mess with variable size fonts. It would be 15262 This is clearly a mess with variable size fonts. It would be
15263 better to let it be displayed like cursors under X. */ 15263 better to let it be displayed like cursors under X. */
15264 if (! overlay_arrow_seen 15264 if ((overlay_arrow_string
15265 && (overlay_arrow_string 15265 = overlay_arrow_at_row (it, row, &overlay_arrow_bitmap),
15266 = overlay_arrow_at_row (it, row, &overlay_arrow_bitmap), 15266 !NILP (overlay_arrow_string)))
15267 !NILP (overlay_arrow_string)))
15268 { 15267 {
15269 /* Overlay arrow in window redisplay is a fringe bitmap. */ 15268 /* Overlay arrow in window redisplay is a fringe bitmap. */
15270 if (STRINGP (overlay_arrow_string)) 15269 if (STRINGP (overlay_arrow_string))