comparison src/dispnew.c @ 83312:5b54039912f4

Merged from miles@gnu.org--gnu-2005 (patch 435-437) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-435 Implement tty vertical-divider face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-436 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-437 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-352
author Karoly Lorentey <lorentey@elte.hu>
date Tue, 21 Jun 2005 15:45:30 +0000
parents c016d82bf02b 4c33b0ac74a3
children bdcbdec78dd3
comparison
equal deleted inserted replaced
83311:c016d82bf02b 83312:5b54039912f4
2706 2706
2707 /* Decide whether we want to add a vertical border glyph. */ 2707 /* Decide whether we want to add a vertical border glyph. */
2708 if (!WINDOW_RIGHTMOST_P (w)) 2708 if (!WINDOW_RIGHTMOST_P (w))
2709 { 2709 {
2710 struct Lisp_Char_Table *dp = window_display_table (w); 2710 struct Lisp_Char_Table *dp = window_display_table (w);
2711 right_border_glyph = (dp && INTEGERP (DISP_BORDER_GLYPH (dp)) 2711
2712 ? XINT (DISP_BORDER_GLYPH (dp)) 2712 right_border_glyph
2713 : '|'); 2713 = ((dp && INTEGERP (DISP_BORDER_GLYPH (dp)))
2714 right_border_glyph = spec_glyph_lookup_face (w, right_border_glyph); 2714 ? spec_glyph_lookup_face (w, XINT (DISP_BORDER_GLYPH (dp)))
2715 : '|');
2716
2717 if (FAST_GLYPH_FACE (right_border_glyph) <= 0)
2718 right_border_glyph
2719 = FAST_MAKE_GLYPH (right_border_glyph, VERTICAL_DIVIDER_FACE_ID);
2715 } 2720 }
2716 } 2721 }
2717 else 2722 else
2718 window_matrix = w->current_matrix; 2723 window_matrix = w->current_matrix;
2719 2724