static unsigned short vertical_bar_bits[] = {
0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0};
-/* HBar cursor bitmap. A horisontal bar; 2 pixels high. */
+/* HBar cursor bitmap. A horizontal bar; 2 pixels high. */
/*
xxxxxxx.
xxxxxxx.
*/
-static unsigned short horisontal_bar_bits[] = {
+static unsigned short horizontal_bar_bits[] = {
0xfe, 0xfe};
{ FRBITS (filled_square_bits), 8, 0, ALIGN_BITMAP_CENTER, 0 },
{ FRBITS (hollow_square_bits), 8, 0, ALIGN_BITMAP_CENTER, 0 },
{ FRBITS (vertical_bar_bits), 8, 0, ALIGN_BITMAP_CENTER, 0 },
- { FRBITS (horisontal_bar_bits), 8, 0, ALIGN_BITMAP_BOTTOM, 0 },
+ { FRBITS (horizontal_bar_bits), 8, 0, ALIGN_BITMAP_BOTTOM, 0 },
{ FRBITS (empty_line_bits), 8, 3, ALIGN_BITMAP_TOP, 0 },
};
draw_fringe_bitmap_1 (w, row, left_p, overlay, NO_FRINGE_BITMAP);
if (left_p && row->overlay_arrow_bitmap != NO_FRINGE_BITMAP)
- draw_fringe_bitmap_1 (w, row, 1, 1,
- (row->overlay_arrow_bitmap < 0
- ? get_logical_cursor_bitmap (w, Qoverlay_arrow)
- : row->overlay_arrow_bitmap));
+ draw_fringe_bitmap_1 (w, row, 1, 1, row->overlay_arrow_bitmap);
}
}
}
+ if (row->overlay_arrow_bitmap < 0)
+ row->overlay_arrow_bitmap = get_logical_fringe_bitmap (w, Qoverlay_arrow, 0, 0);
+
if (row->overlay_arrow_bitmap != cur->overlay_arrow_bitmap)
{
redraw_p = row->redraw_fringe_bitmaps_p = cur->redraw_fringe_bitmaps_p = 1;
DEFUN ("define-fringe-bitmap", Fdefine_fringe_bitmap, Sdefine_fringe_bitmap,
2, 5, 0,
doc: /* Define fringe bitmap BITMAP from BITS of size HEIGHT x WIDTH.
-BITMAP is a symbol or string naming the new fringe bitmap.
+BITMAP is a symbol identifying the new fringe bitmap.
BITS is either a string or a vector of integers.
HEIGHT is height of bitmap. If HEIGHT is nil, use length of BITS.
WIDTH must be an integer between 1 and 16, or nil which defaults to 8.
else if (VECTORP (bits))
h = XVECTOR (bits)->size;
else
- bits = wrong_type_argument (Qsequencep, bits);
+ wrong_type_argument (Qsequencep, bits);
if (NILP (height))
fb.height = h;
Voverflow_newline_into_fringe = Qt;
DEFVAR_LISP ("fringe-bitmaps", &Vfringe_bitmaps,
- doc: /* List of fringe bitmap symbols.
-You must (require 'fringe) to use fringe bitmap symbols in your programs." */);
+ doc: /* List of fringe bitmap symbols. */);
Vfringe_bitmaps = Qnil;
}
}
}
-#ifdef HAVE_NTGUI
+#if defined (HAVE_NTGUI) || defined (MAC_OS)
void
+#ifdef HAVE_NTGUI
w32_init_fringe ()
+#else /* MAC_OS */
+mac_init_fringe ()
+#endif
{
int bt;
rif->define_fringe_bitmap (bt, fb->bits, fb->height, fb->width);
}
}
+#endif
+#ifdef HAVE_NTGUI
void
w32_reset_fringes ()
{