aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2004-10-04 14:13:18 +0000
committerKim F. Storm2004-10-04 14:13:18 +0000
commitd3848fe90d754861881f185b1bc1445d70fc8cdc (patch)
treeaabfa9c93c2379e6ddb60678defadaa78106d49d /src
parent13fcb8896ef7374bd957823f8e526d0ced20f287 (diff)
downloademacs-d3848fe90d754861881f185b1bc1445d70fc8cdc.tar.gz
emacs-d3848fe90d754861881f185b1bc1445d70fc8cdc.zip
(Ffringe_bitmaps_at_pos): Change return value from cons
to list. Include overlay arrow bitmap in return value.
Diffstat (limited to 'src')
-rw-r--r--src/fringe.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/fringe.c b/src/fringe.c
index af2d40b7ee2..71057e1b5cb 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1343,9 +1343,10 @@ DEFUN ("fringe-bitmaps-at-pos", Ffringe_bitmaps_at_pos, Sfringe_bitmaps_at_pos,
1343 0, 2, 0, 1343 0, 2, 0,
1344 doc: /* Return fringe bitmaps of row containing position POS in window WINDOW. 1344 doc: /* Return fringe bitmaps of row containing position POS in window WINDOW.
1345If WINDOW is nil, use selected window. If POS is nil, use value of point 1345If WINDOW is nil, use selected window. If POS is nil, use value of point
1346in that window. Return value is a cons (LEFT . RIGHT) where LEFT and RIGHT 1346in that window. Return value is a list (LEFT RIGHT OV), where LEFT
1347are the fringe bitmap numbers for the bitmaps in the left and right fringe, 1347is the symbol for the bitmap in the left fringe (or nil if no bitmap),
1348resp. If left or right fringe is empty, the corresponding element is nil. 1348RIGHT is similar for the right fringe, and OV is non-nil if there is an
1349overlay arrow in the left fringe.
1349Return nil if POS is not visible in WINDOW. */) 1350Return nil if POS is not visible in WINDOW. */)
1350 (pos, window) 1351 (pos, window)
1351 Lisp_Object pos, window; 1352 Lisp_Object pos, window;
@@ -1373,8 +1374,9 @@ Return nil if POS is not visible in WINDOW. */)
1373 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); 1374 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
1374 row = row_containing_pos (w, textpos, row, NULL, 0); 1375 row = row_containing_pos (w, textpos, row, NULL, 0);
1375 if (row) 1376 if (row)
1376 return Fcons (get_fringe_bitmap_name (row->left_fringe_bitmap), 1377 return list3 (get_fringe_bitmap_name (row->left_fringe_bitmap),
1377 get_fringe_bitmap_name (row->right_fringe_bitmap)); 1378 get_fringe_bitmap_name (row->right_fringe_bitmap),
1379 (row->overlay_arrow_p ? Qt : Qnil));
1378 else 1380 else
1379 return Qnil; 1381 return Qnil;
1380} 1382}