# ------------------------------------------------------------------------------
# fontutils.c | 10 +++++++++-
# main.c | 2 +-
# print.c | 4 ++--
# version.h | 2 +-
# xterm.log.html | 12 ++++++++++++
# 5 files changed, 25 insertions, 5 deletions
# ------------------------------------------------------------------------------
Index: fontutils.c
--- xterm-101+/fontutils.c Sun Apr 25 21:23:09 1999
+++ xterm-102/fontutils.c Tue May 11 21:16:09 1999
@@ -444,11 +444,19 @@
if (EmptyFont(bfs))
goto bad; /* can't use a 0-sized font */
+ /*
+ * Normal/bold fonts should be the same width. Also, the min/max
+ * values should be the same.
+ */
if (nfs->min_bounds.width != nfs->max_bounds.width
|| bfs->min_bounds.width != bfs->max_bounds.width
|| nfs->min_bounds.width != bfs->min_bounds.width
|| nfs->max_bounds.width != bfs->max_bounds.width) {
- TRACE(("Proportional font!\n"))
+ TRACE(("Proportional font! normal %d/%d, bold %d/%d\n",
+ nfs->min_bounds.width,
+ nfs->max_bounds.width,
+ bfs->min_bounds.width,
+ bfs->max_bounds.width))
proportional = True;
}
Index: main.c
--- xterm-101+/main.c Sun May 9 21:31:22 1999
+++ xterm-102/main.c Tue May 11 20:57:24 1999
@@ -1903,7 +1903,7 @@
{
#if defined(__osf__) || (defined(linux) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1))
int tty;
- return (openpty(pty, &tty, NULL, NULL, NULL));
+ return (openpty(pty, &tty, ttydev, NULL, NULL));
#elif defined(SYSV) && defined(i386) && !defined(SVR4)
/*
The order of this code is *important*. On SYSV/386 we want to open
Index: print.c
--- xterm-101+/print.c Sun Apr 11 16:38:14 1999
+++ xterm-102/print.c Tue May 11 21:05:07 1999
@@ -34,11 +34,11 @@
********************************************************/
-#include <stdio.h>
-
#include <xterm.h>
#include <data.h>
#include <error.h>
+
+#include <stdio.h>
#undef CTRL
#define CTRL(c) ((c) & 0x1f)
Index: version.h
--- xterm-101+/version.h Sun May 9 21:32:01 1999
+++ xterm-102/version.h Tue May 11 21:04:24 1999
@@ -6,5 +6,5 @@
* XFree86 to which this version of xterm has been built. The number in
* parentheses is my patch number (T.Dickey).
*/
-#define XTERM_PATCH 101
+#define XTERM_PATCH 102
#define XFREE86_VERSION "XFree86 3.9Pm"
Index: xterm.log.html
--- xterm-101+/xterm.log.html Mon May 10 05:44:18 1999
+++ xterm-102/xterm.log.html Tue May 11 21:11:42 1999
@@ -41,6 +41,7 @@
xc/programs/Xserver/hw/xfree86).
<UL>
+<LI><A HREF="#xterm_102">Patch #102 - 1999/5/12 - XFree86 3.9Pm</A>
<LI><A HREF="#xterm_101">Patch #101 - 1999/5/10 - XFree86 3.9Pm</A>
<LI><A HREF="#xterm_100">Patch #100 - 1999/5/3 - XFree86 3.9Pl</A>
<LI><A HREF="#xterm_99">Patch #99 - 1999/5/2 - XFree86 3.9Pk</A>
@@ -144,6 +145,17 @@
<LI><A HREF="#xterm_02">Patch #2 - 1996/1/7</A>
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+
+<H1><A NAME="xterm_102">Patch #102 - 1999/5/12 - XFree86 3.9Pm</A></H1>
+<ul>
+ <li>revert change to openpty call in patch #101; this causes xterm to
+ fail on DEC-Alpha OSF/1 4.0B (reported by H Merijn Brand).
+
+ <li>modify print.c to move include of stdio.h after the autoconf'd
+ xtermcfg.h since HP's ANSI C compiler otherwise sees inconsistent
+ prototype for getopt, probably due to problem with const (reported by
+ H Merijn Brand).
+</ul>
<H1><A NAME="xterm_101">Patch #101 - 1999/5/10 - XFree86 3.9Pm</A></H1>
<ul>