MANIFEST | 2 +-
configure | 2 +-
configure.in | 4 ++--
package/debian/changelog | 6 ++++++
package/freebsd/Makefile | 2 +-
package/xterm.spec | 4 ++--
screen.c | 6 ++++--
util.c | 5 ++---
version.h | 6 +++---
xterm.log.html | 25 ++++++++++++++++++++++++-
10 files changed, 46 insertions(+), 16 deletions(-)
New commits:
commit 6bd6a94b6909f8bda0c1262e0ce6d84ff92d8a61
Author: Sven Joachim <svenj...@gmx.de>
Date: Sun Mar 8 09:32:59 2015 +0100
Imported Upstream version 316
diff --git a/MANIFEST b/MANIFEST
index c9694e3..658e7b6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-315, version xterm-315
+MANIFEST for xterm-316, version xterm-316
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff --git a/configure b/configure
index 9ab06f9..ee18611 100755
--- a/configure
+++ b/configure
@@ -15390,7 +15390,7 @@ if test "${enable_initial_erase+set}" = set; then
enableval="$enable_initial_erase"
initial_erase=$enableval
else
- initial_erase=maybe
+ initial_erase=False
fi;
echo "$as_me:15396: result: $initial_erase" >&5
diff --git a/configure.in b/configure.in
index 0e82378..f7226f9 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $XTermId: configure.in,v 1.331 2015/02/15 19:12:34 tom Exp $
+dnl $XTermId: configure.in,v 1.332 2015/03/05 20:54:36 tom Exp $
dnl
dnl
-----------------------------------------------------------------------------
dnl this file is part of xterm
@@ -342,7 +342,7 @@ AC_MSG_CHECKING(for default pty initial erase setting)
AC_ARG_ENABLE(initial-erase,
[ --enable-initial-erase set default ptyInitialErase resource
(default: maybe)],
[initial_erase=$enableval],
- [initial_erase=maybe])
+ [initial_erase=False])
CF_XBOOL_RESULT(DEF_INITIAL_ERASE,initial_erase,[Define to 1 if default pty
initial erase setting is TRUE])
AC_MSG_CHECKING(if alt should send ESC)
diff --git a/package/debian/changelog b/package/debian/changelog
index 312fc0b..566c90d 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+xterm-dev (316) unstable; urgency=low
+
+ * maintenance updates
+
+ -- Thomas E. Dickey <dic...@invisible-island.net> Thu, 05 Mar 2015 15:52:55
-0500
+
xterm-dev (315) unstable; urgency=low
* maintenance updates
diff --git a/package/freebsd/Makefile b/package/freebsd/Makefile
index b59b13b..7997e45 100644
--- a/package/freebsd/Makefile
+++ b/package/freebsd/Makefile
@@ -5,7 +5,7 @@
# and "make makesum".
PORTNAME= xterm
-PORTVERSION= 315
+PORTVERSION= 316
CATEGORIES= x11
MASTER_SITES= ftp://invisible-island.net/xterm/ \
CRITICAL
diff --git a/package/xterm.spec b/package/xterm.spec
index 6c14c36..438fecb 100644
--- a/package/xterm.spec
+++ b/package/xterm.spec
@@ -1,11 +1,11 @@
-# $XTermId: xterm.spec,v 1.80 2015/01/02 12:49:44 tom Exp $
+# $XTermId: xterm.spec,v 1.81 2015/03/05 20:52:59 tom Exp $
Summary: X terminal emulator (development version)
%global my_middle xterm
%global my_suffix -dev
%global fullname %{my_middle}%{my_suffix}
%global my_class XTermDev
Name: %{fullname}
-Version: 315
+Version: 316
Release: 1
License: X11
Group: User Interface/X
diff --git a/screen.c b/screen.c
index d4a09d6..c8f5f58 100644
--- a/screen.c
+++ b/screen.c
@@ -1,4 +1,4 @@
-/* $XTermId: screen.c,v 1.509 2015/02/23 01:40:19 tom Exp $ */
+/* $XTermId: screen.c,v 1.510 2015/03/07 01:19:23 tom Exp $ */
/*
* Copyright 1999-2014,2015 by Thomas E. Dickey
@@ -1355,7 +1355,7 @@ ScrnDeleteChar(XtermWidget xw, unsigned n)
ShowWrapMarks(xw, row, ld);
}
}
- ClearCells(xw, 0, n, row, (last + 1 - (int) n));
+ ClearCells(xw, 0, n, row, (last - (int) n));
#undef MemMove
}
@@ -2495,6 +2495,8 @@ ScrnCopyRectangle(XtermWidget xw, XTermRect *source, int
nparam, int *params)
for (row = source->top - 1; row < source->bottom; ++row) {
ld = getLineData(screen, row);
+ if (ld == 0)
+ continue;
j = (Cardinal) (row - (source->top - 1));
for (col = source->left - 1; col < source->right; ++col) {
k = (Cardinal) (col - (source->left - 1));
diff --git a/util.c b/util.c
index ea25e52..043221f 100644
--- a/util.c
+++ b/util.c
@@ -1,4 +1,4 @@
-/* $XTermId: util.c,v 1.678 2015/03/02 12:58:55 tom Exp $ */
+/* $XTermId: util.c,v 1.679 2015/03/07 15:46:37 tom Exp $ */
/*
* Copyright 1999-2014,2015 by Thomas E. Dickey
@@ -1416,8 +1416,7 @@ DeleteChar(XtermWidget xw, unsigned n)
if (screen->cursor_state)
HideCursor();
- if (!ScrnIsRowInMargins(screen, screen->cur_row) ||
- !ScrnIsColInMargins(screen, screen->cur_col))
+ if (!ScrnIsColInMargins(screen, screen->cur_col))
return;
TRACE(("DeleteChar count=%d\n", n));
diff --git a/version.h b/version.h
index 0512f71..65e0063 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.406 2015/03/03 00:41:42 tom Exp $ */
+/* $XTermId: version.h,v 1.408 2015/03/08 00:29:53 tom Exp $ */
/*
* Copyright 1998-2014,2015 by Thomas E. Dickey
@@ -38,8 +38,8 @@
* version of X to which this version of xterm has been built. The resulting
* number in parentheses is my patch number (Thomas E. Dickey).
*/
-#define XTERM_PATCH 315
-#define XTERM_DATE 2015-03-02
+#define XTERM_PATCH 316
+#define XTERM_DATE 2015-03-07
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index bbcb33f..5631165 100644
--- a/xterm.log.html
+++ b/xterm.log.html
@@ -30,7 +30,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
*****************************************************************************
- $XTermId: xterm.log.html,v 1.1586 2015/03/03 00:42:37 tom Exp $
+ $XTermId: xterm.log.html,v 1.1591 2015/03/08 00:30:07 tom Exp $
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
@@ -72,6 +72,8 @@
CHANGELOG</a>).</p>
<ul>
+ <li><a href="#xterm_316">Patch #316 - 2015/03/07</a></li>
+
<li><a href="#xterm_315">Patch #315 - 2015/03/02</a></li>
<li><a href="#xterm_314">Patch #314 - 2014/12/28</a></li>
@@ -915,6 +917,27 @@
<li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li>
</ul>
+ <h1><a name="xterm_316" id="xterm_316">Patch #316 -
+ 2015/03/07</a></h1>
+
+ <ul>
+ <li>revert change to make <code>DCH</code> honor top/bottom
+ scrolling margins. For the record, both the VT420 and VT520
+ reference manuals incorrectly state that <em>"DCH has no effect
+ outside the scrolling margins."</em></li>
+
+ <li>fix regression in <code>DCH</code> introduced in adjustment
+ for limit-check in <a href="#xterm_314">patch #315</a>
+ (report/testcase by Zoltán Kéri, also reported by
+ Christian Weisgerber).</li>
+
+ <li>correct default value for configure option
+ <code>--enable-initial-erase</code>; it should be "False", but
+ in <a href="#xterm_315">patch #315</a> it was "Maybe", which
+ differed from default set in <a href="#xterm_192">patch
+ #192</a>.</li>
+ </ul>
+
<h1><a name="xterm_315" id="xterm_315">Patch #315 -
2015/03/02</a></h1>
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yux5o-00014e...@moszumanska.debian.org
