[Emacs-diffs] emacs/src ChangeLog term.c

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/06/27 21:27:53

Modified files:
        src            : ChangeLog term.c 

Log message:
        * term.c (turn_on_face): Allow simultaneously bold and dim
        terminal faces (Bug#3530).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7607&r2=1.7608
http://cvs.savannah.gnu.org/viewcvs/emacs/src/term.c?cvsroot=emacs&r1=1.242&r2=1.243

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7607
retrieving revision 1.7608
diff -u -b -r1.7607 -r1.7608
--- ChangeLog   27 Jun 2009 19:50:50 -0000      1.7607
+++ ChangeLog   27 Jun 2009 21:27:51 -0000      1.7608
@@ -1,3 +1,8 @@
+2009-06-27  Chuck Blake  <address@hidden>  (tiny change)
+
+       * term.c (turn_on_face): Allow simultaneously bold and dim
+       terminal faces (Bug#3530).
+
 2009-06-27  Chong Yidong  <address@hidden>
 
        * frame.c (x_get_arg): Check if dpyinfo is non-NULL.

Index: term.c
===================================================================
RCS file: /sources/emacs/emacs/src/term.c,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -b -r1.242 -r1.243
--- term.c      30 Apr 2009 05:02:03 -0000      1.242
+++ term.c      27 Jun 2009 21:27:53 -0000      1.243
@@ -1969,13 +1969,10 @@
        }
     }
 
-  if (face->tty_bold_p)
-    {
-      if (MAY_USE_WITH_COLORS_P (tty, NC_BOLD))
+  if (face->tty_bold_p && 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))
+
+  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.  */
@@ -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)