# ------------------------------------------------------------------------------
# charproc.c | 15 +++++----------
# screen.c | 11 +++++------
# version.h | 2 +-
# xterm.log.html | 10 ++++++++++
# 4 files changed, 21 insertions(+), 17 deletions(-)
# ------------------------------------------------------------------------------
Index: charproc.c
--- xterm-143+/charproc.c Sun Aug 13 19:57:19 2000
+++ xterm-144/charproc.c Wed Aug 23 18:27:39 2000
@@ -2473,11 +2473,11 @@
/* strip parity bit */
for(i = VTbuffer.cnt, cp = VTbuffer.ptr ; i > 0 ; i--)
*cp++ &= 0177; /* originally CHAR */
- if(screen->scrollWidget && screen->scrollttyoutput &&
- screen->topline < 0)
- /* Scroll to bottom */
- WindowScroll(screen, 0);
- break;
+ if(screen->scrollWidget && screen->scrollttyoutput &&
+ screen->topline < 0)
+ /* Scroll to bottom */
+ WindowScroll(screen, 0);
+ break;
}
}
else {
@@ -2721,11 +2721,6 @@
chars_chomped --;
width_here -= my_wcwidth(buf[chars_chomped + offset]);
need_wrap = 1;
- }
-
- if (width_here = 0) {
- screen->do_wrap = 0;
- continue;
}
if (chars_chomped != (len - offset)) {
Index: screen.c
--- xterm-143+/screen.c Fri Aug 11 06:09:25 2000
+++ xterm-144/screen.c Wed Aug 23 18:30:19 2000
@@ -307,16 +307,15 @@
Char *col;
int wrappedbit;
Char starcol, starcol2;
- #if OPT_WIDE_CHARS
+#if OPT_WIDE_CHARS
Char *comb1l, *comb1h, *comb2l, *comb2h;
- #endif
+#endif
- #if OPT_WIDE_CHARS
+#if OPT_WIDE_CHARS
int real_width = visual_width(PAIRED_CHARS(str, str2), length);
- #else
+#else
int real_width = length;
- #endif
- str[len] = 0;
+#endif
if (length > avail)
length = avail;
Index: version.h
--- xterm-143+/version.h Sat Aug 19 14:15:59 2000
+++ xterm-144/version.h Wed Aug 23 18:28:43 2000
@@ -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 143
+#define XTERM_PATCH 144
#define XFREE86_VERSION "XFree86 4.0.1b"
Index: xterm.log.html
--- xterm-143+/xterm.log.html Sat Aug 19 22:49:36 2000
+++ xterm-144/xterm.log.html Wed Aug 23 18:35:12 2000
@@ -42,6 +42,7 @@
xc/programs/Xserver/hw/xfree86).
<UL>
+<LI><A HREF="#xterm_144">Patch #144 - 2000/8/23 - XFree86 4.0.1b</A>
<LI><A HREF="#xterm_143">Patch #143 - 2000/8/19 - XFree86 4.0.1b</A>
<LI><A HREF="#xterm_142">Patch #142 - 2000/8/18 - XFree86 4.0.1b</A>
<LI><A HREF="#xterm_141">Patch #141 - 2000/7/14 - XFree86 4.0.1b</A>
@@ -187,6 +188,15 @@
<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_144">Patch #144 - 2000/8/23 - XFree86 4.0.1b</A></H1>
+<ul>
+ <li>remove a spurious assignment in ScreenWrite() from Robert Brady's
+ patch which set a null at the "end" of the buffer to be written.
+ That made the autowrap feature write a blank in the first column for
+ the non-UTF-8 configuration, rather than the actual character
+ (reported by Alan Citterman <alan@mticket.com>).
+</ul>
<H1><A NAME="xterm_143">Patch #143 - 2000/8/19 - XFree86 4.0.1b</A></H1>
<ul>