Skip to content

GitLab

Commit 4189ed40 authored by Chong Yidong's avatar Chong Yidong
Browse files

* term.c (turn_on_face): Allow simultaneously bold and dim 

terminal faces (Bug#3530).
parent e8a2b2da
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 12 deletions
src/ChangeLog
View file @ 4189ed40
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.
......
src/term.c
View file @ 4189ed40
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment