Mercurial > emacs
changeset 103605:d6ac90c70d24
* term.c (turn_on_face): Allow simultaneously bold and dim
terminal faces (Bug#3530).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sat, 27 Jun 2009 21:27:51 +0000 |
| parents | 5883b0a08647 |
| children | e7c02c708bb1 |
| files | src/ChangeLog src/term.c |
| diffstat | 2 files changed, 10 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Jun 27 20:44:03 2009 +0000 +++ b/src/ChangeLog Sat Jun 27 21:27:51 2009 +0000 @@ -1,3 +1,8 @@ +2009-06-27 Chuck Blake <cblake@pdos.csail.mit.edu> (tiny change) + + * term.c (turn_on_face): Allow simultaneously bold and dim + terminal faces (Bug#3530). + 2009-06-27 Chong Yidong <cyd@stupidchicken.com> * frame.c (x_get_arg): Check if dpyinfo is non-NULL.
--- a/src/term.c Sat Jun 27 20:44:03 2009 +0000 +++ b/src/term.c Sat Jun 27 21:27:51 2009 +0000 @@ -1969,14 +1969,11 @@ } } - 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 @@ "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)