xterm: Changes to 'debian-unstable'
MANIFEST | 2 +-
debian/changelog | 4 ++--
screen.c | 6 ++++--
scrollback.c | 4 ++--
version.h | 4 ++--
xterm.log.html | 10 +++++++++-
6 files changed, 20 insertions(+), 10 deletions(-)
New commits:
commit 4df2ccbbc7aeba2cd811b35e4b19bc92ad281671
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 2 11:04:22 2010 +0200
Bump changelog
diff --git a/debian/changelog b/debian/changelog
index 6e348b6..c48aa97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (257-1) UNRELEASED; urgency=low
+xterm (258-1) UNRELEASED; urgency=low
* terminfo: derive xterm{16,256,88}-color from xterm-debian (patch by Sven
Joachim), closes: #547443.
@@ -8,7 +8,7 @@ xterm (257-1) UNRELEASED; urgency=low
allowSendEvents resource prevents setting cursor color on command-line
(closes: #572928)
- -- Julien Cristau <jcristau@debian.org> Thu, 22 Apr 2010 18:32:23 +0200
+ -- Julien Cristau <jcristau@debian.org> Sun, 02 May 2010 11:04:12 +0200
xterm (256-1) unstable; urgency=low
commit 8c79875f8180d51a25fa262705f039cd507cb466
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 2 11:00:49 2010 +0200
Import xterm 258
diff --git a/MANIFEST b/MANIFEST
index c82ef69..262de0b 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-257, version xterm-257
+MANIFEST for xterm-258, version xterm-258
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff --git a/screen.c b/screen.c
index af0b948..e05d1ee 100644
--- a/screen.c
+++ b/screen.c
@@ -1,4 +1,4 @@
-/* $XTermId: screen.c,v 1.417 2010/04/18 18:14:10 tom Exp $ */
+/* $XTermId: screen.c,v 1.418 2010/04/28 23:49:28 tom Exp $ */
/*
* Copyright 1999-2009,2010 by Thomas E. Dickey
@@ -1327,7 +1327,9 @@ ScrnRefresh(XtermWidget xw,
TRACE2(("ScrnRefresh row=%d lastind=%d ->%d\n",
row, lastind, ROW2INX(screen, lastind)));
- if ((ld = getLineData(screen, ROW2INX(screen, lastind))) == 0) {
+ if ((ld = getLineData(screen, ROW2INX(screen, lastind))) == 0
+ || ld->charData == 0
+ || ld->attribs == 0) {
continue;
}
if (maxcol >= (int) ld->lineSize) {
diff --git a/scrollback.c b/scrollback.c
index 99554c2..a28ec7e 100644
--- a/scrollback.c
+++ b/scrollback.c
@@ -1,4 +1,4 @@
-/* $XTermId: scrollback.c,v 1.13 2010/04/18 14:41:29 tom Exp $ */
+/* $XTermId: scrollback.c,v 1.14 2010/04/28 21:47:09 tom Exp $ */
/************************************************************
@@ -48,7 +48,7 @@ getScrollback(TScreen * screen, int row)
{
LineData *result = 0;
- if (REAL_ROW(screen, row) >= 0) {
+ if (screen->saved_fifo > 0 && REAL_ROW(screen, row) >= 0) {
unsigned which = ROW2FIFO(screen, row);
ScrnBuf where = scrnHeadAddr(screen, screen->saveBuf_index, which);
result = (LineData *) where;
diff --git a/version.h b/version.h
index 9809c16..6cdbe1e 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
/*
- * $XTermId: version.h,v 1.315 2010/03/12 00:53:57 tom Exp $
+ * $XTermId: version.h,v 1.316 2010/04/23 08:43:31 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 257
+#define XTERM_PATCH 258
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index 6f8c9bf..b3aca53 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.932 2010/04/22 08:18:56 tom Exp $
+ $XTermId: xterm.log.html,v 1.933 2010/05/02 01:07:19 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_258">Patch #258 - 2010/5/1</A>
<LI><A HREF="#xterm_257">Patch #257 - 2010/4/22</A>
<LI><A HREF="#xterm_256">Patch #256 - 2010/3/6</A>
<LI><A HREF="#xterm_255">Patch #255 - 2010/1/21</A>
@@ -316,6 +317,13 @@ is the latest version of this file.
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+<H1><A NAME="xterm_258">Patch #258 - 2010/5/1</A></H1>
+<ul>
+ <li>add pointer-checks in <code>ScrnRefresh</code> to fix a case in
+ rapid scrolling where an empty record is fetched from the
+ scrollback FIFO.
+</ul>
+
<H1><A NAME="xterm_257">Patch #257 - 2010/4/22</A></H1>
<ul>
<li>correct ctlseqs.ms description of OSC 17 and OSC 19
Reply to: