MANIFEST | 2 +-
fontutils.c | 7 +------
minstall.sh | 9 ++++++++-
version.h | 5 ++---
xterm.log.html | 14 ++++++++++++--
5 files changed, 24 insertions(+), 13 deletions(-)
New commits:
commit dbdf13b65a972064129c00623e5b5adc999c6961
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon Aug 13 01:55:24 2007 +0200
Import xterm 229.
diff --git a/MANIFEST b/MANIFEST
index cc11697..ba5965c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-228, version xterm-228
+MANIFEST for xterm-229, version xterm-229
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff --git a/fontutils.c b/fontutils.c
index db8839c..d03dbab 100644
--- a/fontutils.c
+++ b/fontutils.c
@@ -1,8 +1,4 @@
-/* $XTermId: fontutils.c,v 1.249 2007/06/17 12:50:22 tom Exp $ */
-
-/*
- * $XFree86: xc/programs/xterm/fontutils.c,v 1.60 2006/04/30 21:55:39 dickey
Exp $
- */
+/* $XTermId: fontutils.c,v 1.251 2007/08/05 00:11:55 tom Exp $ */
/************************************************************
@@ -850,7 +846,6 @@ xtermLoadFont(XtermWidget xw,
fnts[fWBold] = xtermCloseFont(xw, fnts[fWBold]);
}
if (fnts[fWBold] == 0) {
- free(myfonts.f_wb);
myfonts.f_wb = myfonts.f_w;
fnts[fWBold] = fnts[fWide];
TRACE(("...cannot load wide-bold, use wide %s\n",
NonNull(myfonts.f_w)));
diff --git a/minstall.sh b/minstall.sh
index dd9635e..89e17da 100755
--- a/minstall.sh
+++ b/minstall.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $XTermId: minstall.sh,v 1.11 2007/05/24 22:10:42 tom Exp $
+# $XTermId: minstall.sh,v 1.12 2007/08/12 15:29:02 tom Exp $
#
# Install manpages, substituting a reasonable section value since XFree86 4.x
# and derived imakes do not use constants...
@@ -11,6 +11,13 @@
# $4 = app-defaults directory
#
+# override locale...
+LANG=C; export LANG
+LANGUAGE=C; export LANGUAGE
+LC_ALL=C; export LC_ALL
+LC_CTYPE=C; export LC_CTYPE
+
+# get parameters
MINSTALL="$1"
OLD_FILE="$2"
END_FILE="$3"
diff --git a/version.h b/version.h
index 5b35cf6..3a608a0 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,4 @@
-/* $XTermId: version.h,v 1.283 2007/07/07 15:29:25 tom Exp $ */
-/* $XFree86: xc/programs/xterm/version.h,v 3.126 2006/06/20 00:42:38 dickey
Exp $ */
+/* $XTermId: version.h,v 1.285 2007/08/12 15:37:19 tom Exp $ */
/*
* These definitions are used to build the string that's printed in response to
@@ -7,7 +6,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 228
+#define XTERM_PATCH 229
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index bb3204e..83fd700 100644
--- a/xterm.log.html
+++ b/xterm.log.html
@@ -20,8 +20,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF *
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. *
*****************************************************************************
- $XTermId: xterm.log.html,v 1.596 2007/07/22 23:12:38 tom Exp $
- $XFree86: xc/programs/xterm/xterm.log.html,v 1.151 2006/06/20 00:42:38
dickey Exp $
+ $XTermId: xterm.log.html,v 1.600 2007/08/12 17:32:04 tom Exp $
-->
<HTML>
<HEAD>
@@ -46,6 +45,7 @@ Most of these are summarized in the XFree86 CHANGELOG
is the latest version of this file.
<UL>
+<LI><A HREF="#xterm_229">Patch #229 - 2008/8/12</A>
<LI><A HREF="#xterm_228">Patch #228 - 2007/7/22</A>
<LI><A HREF="#xterm_227">Patch #227 - 2007/6/27</A>
<LI><A HREF="#xterm_226">Patch #226 - 2007/6/17</A>
@@ -277,6 +277,16 @@ is the latest version of this file.
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+<H1><A NAME="xterm_229">Patch #229 - 2008/8/12</A></H1>
+<ul>
+ <li>override locale in minstall.sh;
+ change in <a href="#xterm_226">patch #226</a>
+ does not work in UTF-8 locale (report by Zdenek Sekera).
+
+ <li>undo an incorrect fix for a memory leak
+ in <a href="#xterm_209">patch #209</a> (Debian #435858).
+</ul>
+
<H1><A NAME="xterm_228">Patch #228 - 2007/7/22</A></H1>
<ul>
<li>modify configure script to permit combining
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
