xterm: Changes to 'upstream-unstable'
charproc.c | 15 ++++++++++-----
version.h | 4 ++--
xterm.log.html | 10 +++++++++-
3 files changed, 21 insertions(+), 8 deletions(-)
New commits:
commit 400e8ed360cd27710233916db075673bb3c78a2a
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 28 21:50:38 2010 +0100
Imported Upstream version 261
diff --git a/charproc.c b/charproc.c
index a0b2d7f..b75a093 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1070 2010/06/20 21:39:59 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1071 2010/06/28 09:03:42 tom Exp $ */
/*
@@ -6551,10 +6551,15 @@ VTInitialize(Widget wrequest,
wnew->misc.render_font =
(Boolean) extendedBoolean(wnew->misc.render_font_s,
tblRenderFont, erLast);
- if (wnew->misc.render_font == erDefault && IsEmpty(wnew->misc.face_name)) {
- wnew->misc.face_name = x_strdup(DEFFACENAME_AUTO);
- TRACE(("will allow runtime switch to render_font using \"%s\"\n",
- wnew->misc.face_name));
+ if (wnew->misc.render_font == erDefault) {
+ if (IsEmpty(wnew->misc.face_name)) {
+ wnew->misc.face_name = x_strdup(DEFFACENAME_AUTO);
+ TRACE(("will allow runtime switch to render_font using \"%s\"\n",
+ wnew->misc.face_name));
+ } else {
+ wnew->misc.render_font = erTrue;
+ TRACE(("initially using TrueType font\n"));
+ }
}
/* minor tweak to make debug traces consistent: */
if (wnew->misc.render_font) {
diff --git a/version.h b/version.h
index 296dcf0..08a4fe2 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
/*
- * $XTermId: version.h,v 1.318 2010/06/13 16:03:59 tom Exp $
+ * $XTermId: version.h,v 1.319 2010/06/28 08:49:07 tom Exp $
* ----------------------------------------------------------------------------
* this file is part of xterm
*
@@ -39,7 +39,7 @@
* version of X to which this version of xterm has been built. The number in
* parentheses is my patch number (Thomas E. Dickey).
*/
-#define XTERM_PATCH 260
+#define XTERM_PATCH 261
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index deab291..2e33935 100644
--- a/xterm.log.html
+++ b/xterm.log.html
@@ -31,7 +31,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
*****************************************************************************
- $XTermId: xterm.log.html,v 1.954 2010/06/21 00:40:58 tom Exp $
+ $XTermId: xterm.log.html,v 1.957 2010/06/28 09:25:58 tom Exp $
-->
<HTML>
<HEAD>
@@ -56,6 +56,7 @@ Most of these are summarized in the XFree86 CHANGELOG
is the latest version of this file.
<UL>
+<LI><A HREF="#xterm_261">Patch #261 - 2010/6/28</A>
<LI><A HREF="#xterm_260">Patch #260 - 2010/6/20</A>
<LI><A HREF="#xterm_259">Patch #259 - 2010/6/5</A>
<LI><A HREF="#xterm_258">Patch #258 - 2010/5/1</A>
@@ -319,6 +320,13 @@ is the latest version of this file.
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+<H1><A NAME="xterm_261">Patch #261 - 2010/6/28</A></H1>
+<ul>
+ <li>fix regression in <code>renderFont</code> logic, from
+ <a href="#xterm_260">patch #260</a> changes
+ (report by Joseph Quinsey).
+</ul>
+
<H1><A NAME="xterm_260">Patch #260 - 2010/6/20</A></H1>
<ul>
<li>modify <code>plink.sh</code> to work around problem linking to
Reply to: