Mercurial > emacs
diff 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 |
line wrap: on
line diff
--- a/src/dispnew.c Tue Jun 21 15:42:45 2005 +0000 +++ b/src/dispnew.c Tue Jun 21 15:45:30 2005 +0000 @@ -2708,10 +2708,15 @@ if (!WINDOW_RIGHTMOST_P (w)) { struct Lisp_Char_Table *dp = window_display_table (w); - right_border_glyph = (dp && INTEGERP (DISP_BORDER_GLYPH (dp)) - ? XINT (DISP_BORDER_GLYPH (dp)) - : '|'); - right_border_glyph = spec_glyph_lookup_face (w, right_border_glyph); + + right_border_glyph + = ((dp && INTEGERP (DISP_BORDER_GLYPH (dp))) + ? spec_glyph_lookup_face (w, XINT (DISP_BORDER_GLYPH (dp))) + : '|'); + + if (FAST_GLYPH_FACE (right_border_glyph) <= 0) + right_border_glyph + = FAST_MAKE_GLYPH (right_border_glyph, VERTICAL_DIVIDER_FACE_ID); } } else