X Strike Force X.Org X11 SVN commit: r3977 - in trunk/app/xterm/debian: . patches
Author: julien
Date: 2006-11-09 20:49:10 -0500 (Thu, 09 Nov 2006)
New Revision: 3977
Added:
trunk/app/xterm/debian/patches/903_obey_boldmode.diff
Modified:
trunk/app/xterm/debian/changelog
trunk/app/xterm/debian/patches/series
Log:
* Add patch 903 by Tim Pope <debian-bug@rebelongto.us> to not ignore the
boldmode setting. Thanks to Joey Hess <joeyh@debian.org> for reporting
this issue and to Thomas Dickey for his comments (closes: #347790).
Modified: trunk/app/xterm/debian/changelog
===================================================================
--- trunk/app/xterm/debian/changelog 2006-11-08 10:43:54 UTC (rev 3976)
+++ trunk/app/xterm/debian/changelog 2006-11-10 01:49:10 UTC (rev 3977)
@@ -11,8 +11,11 @@
* Also add the changelog entry for xterm 208-3.1, so that the BTS doesn't
consider bugs reported against that version as "from other Branch".
The changes from this NMU have been obsoleted by 210-2.
+ * Add patch 903 by Tim Pope <debian-bug@rebelongto.us> to not ignore the
+ boldmode setting. Thanks to Joey Hess <joeyh@debian.org> for reporting
+ this issue and to Thomas Dickey for his comments (closes: #347790).
- -- Julien Cristau <julien.cristau@ens-lyon.org> Wed, 8 Nov 2006 10:43:47 +0100
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Fri, 10 Nov 2006 02:48:04 +0100
xterm (222-1) unstable; urgency=low
Added: trunk/app/xterm/debian/patches/903_obey_boldmode.diff
===================================================================
--- trunk/app/xterm/debian/patches/903_obey_boldmode.diff (rev 0)
+++ trunk/app/xterm/debian/patches/903_obey_boldmode.diff 2006-11-10 01:49:10 UTC (rev 3977)
@@ -0,0 +1,20 @@
+Patch by Tim Pope <debian-bug@rebelongto.us> to obey the boldmode setting.
+See Debian bug #347790.
+
+Index: xterm/fontutils.c
+===================================================================
+--- xterm.orig/fontutils.c 2006-10-23 22:34:24.000000000 +0200
++++ xterm/fontutils.c 2006-11-10 02:30:07.000000000 +0100
+@@ -886,6 +886,12 @@
+ fnts[fBold] = fnts[fNorm];
+ }
+
++ if (!screen->bold_mode && fnts[fBold] != fnts[fNorm]) {
++ TRACE(("...ignoring bold font, as per boldMode\n"));
++ XFreeFont(screen->display, fnts[fBold]);
++ fnts[fBold] = fnts[fNorm];
++ }
++
+ if_OPT_WIDE_CHARS(screen, {
+ if (fnts[fWide] != 0
+ && fnts[fWBold] != 0
Modified: trunk/app/xterm/debian/patches/series
===================================================================
--- trunk/app/xterm/debian/patches/series 2006-11-08 10:43:54 UTC (rev 3976)
+++ trunk/app/xterm/debian/patches/series 2006-11-10 01:49:10 UTC (rev 3977)
@@ -1,3 +1,4 @@
900_debian_xterm.diff -p0
901_xterm_manpage.diff -p0
902_disallowWindowOps
+903_obey_boldmode.diff
Reply to: