From 4189ed40b8f6e0e1c355ca871233d8993c764a07 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 27 Jun 2009 21:27:51 +0000 Subject: [PATCH] * term.c (turn_on_face): Allow simultaneously bold and dim terminal faces (Bug#3530). --- src/ChangeLog | 5 +++++ src/term.c | 17 +++++------------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index d0130c73474..d359d25e4c4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-06-27 Chuck Blake (tiny change) + + * term.c (turn_on_face): Allow simultaneously bold and dim + terminal faces (Bug#3530). + 2009-06-27 Chong Yidong * frame.c (x_get_arg): Check if dpyinfo is non-NULL. diff --git a/src/term.c b/src/term.c index f9875f8bc06..3f97a74cbd6 100644 --- a/src/term.c +++ b/src/term.c @@ -1969,14 +1969,11 @@ turn_on_face (f, face_id) } } - if (face->tty_bold_p) - { - if (MAY_USE_WITH_COLORS_P (tty, NC_BOLD)) - OUTPUT1_IF (tty, tty->TS_enter_bold_mode); - } - else if (face->tty_dim_p) - if (MAY_USE_WITH_COLORS_P (tty, NC_DIM)) - OUTPUT1_IF (tty, tty->TS_enter_dim_mode); + if (face->tty_bold_p && MAY_USE_WITH_COLORS_P (tty, NC_BOLD)) + OUTPUT1_IF (tty, tty->TS_enter_bold_mode); + + if (face->tty_dim_p && MAY_USE_WITH_COLORS_P (tty, NC_DIM)) + OUTPUT1_IF (tty, tty->TS_enter_dim_mode); /* Alternate charset and blinking not yet used. */ if (face->tty_alt_charset_p @@ -3722,10 +3719,6 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", "Screen size %dx%d is too small", FrameCols (tty), FrameRows (tty)); -#if 0 /* This is not used anywhere. */ - tty->terminal->min_padding_speed = tgetnum ("pb"); -#endif - TabWidth (tty) = tgetnum ("tw"); if (!tty->TS_bell) -- 2.39.2