MANIFEST | 2 - configure | 2 - configure.in | 4 +-- debian/changelog | 8 +++++- debian/copyright | 4 +-- debian/local/xterm.faq.html | 54 +++++++++++++++++++++++++++++++++++++++++--- 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 +++++++++++++++++++- 13 files changed, 106 insertions(+), 22 deletions(-)
New commits: commit d62459d726a26d22a9b250d43a853c2b84895c63 Author: Sven Joachim <[email protected]> Date: Sun Mar 8 09:51:58 2015 +0100 Update copy of XTerm FAQ to revision 1.293 (dated 2015/02/16) diff --git a/debian/changelog b/debian/changelog index 4389d07..f9e0d04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ xterm (316-1) UNRELEASED; urgency=low backarrow key (Closes: #775952). * Refresh Debian patches. * Update years in debian/copyright. + * Update copy of XTerm FAQ to revision 1.293 (dated 2015/02/16). -- Sven Joachim <[email protected]> Wed, 04 Mar 2015 17:09:50 +0100 diff --git a/debian/local/xterm.faq.html b/debian/local/xterm.faq.html index 3fb4bae..b307868 100644 --- a/debian/local/xterm.faq.html +++ b/debian/local/xterm.faq.html @@ -19,7 +19,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.faq.html,v 1.289 2014/12/19 01:59:01 tom Exp $ + $XTermId: xterm.faq.html,v 1.293 2015/02/16 11:31:49 tom Exp $ --> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> @@ -54,7 +54,7 @@ <p><a href="/">http://invisible-island.net/</a><a href= "./">xterm/</a><br> - Copyright © 1997-2013,2014 by Thomas E. Dickey</p> + Copyright © 1997-2014,2015 by Thomas E. Dickey</p> <hr> <p><a href= @@ -3571,7 +3571,13 @@ ESC O F <p>Downstream packagers (when they noticed this) accommodated the bug by modifying the VT100 translations resource which is not a good technical solution since it interferes with the - users' ability to modify that resource. See <a href= + users' ability to modify that resource. For example, Red Hat + bug <a href= + "https://bugzilla.redhat.com/show_bug.cgi?id=100695";>#100695</a> + quoted a suggested <a href= + "https://bugzilla.redhat.com/attachment.cgi?id=93107&action=diff";> + patch</a> which shows that the package had overridden the + xterm behavior for shifted function keys. See <a href= "xterm.faq.html#xterm_xmodmap">this</a> for more discussion.</p> </dd> @@ -4097,6 +4103,48 @@ ESC O F to the typical user has so far not been in line with the usefulness of the feature.</p> + <p>For those who are not constrained by cost, since <a href= + "xterm.log.html#xterm_305">patch #305</a> xterm provides an + experimental compile-time option to support italics. The main + reason for implementing this is to be able to test the italics + feature added in ncurses (patch <a href= + "/ncurses/NEWS.html#t20130831">5.9.20130831</a>):</p> + + <ul> + <li>this increases the size of the attributes data.</li> + + <li>the feature requires some overhead for font-switching + (treating italics as "rare")</li> + </ul> + + <p>The increase in size is not entirely wasted. The SGR + attributes for <em>dim</em>, <em>strike-out</em>, and + <em>double-underscore</em> also are implemented. However, the + last two are not in the portable terminfo definition (from + X/Open), and are not supported in the higher-level curses + interface (there is no <code>A_STRIKE</code> for that + reason).</p> + + <p>Here are screenshots showing the ncurses test-program + displaying video attributes (including italics). The first uses + bitmap fonts:</p> + + <blockquote> + <p><a href= + "/ncurses/images/ncurses6-bitmap-italics.png"><img width="300" + src="/ncurses/images/ncurses6-bitmap-italics.png" alt= + "ncurses – video attributes with bitmap-font"></a></p> + </blockquote> + + <p>and the second uses a (same size) TrueType font:</p> + + <blockquote> + <p><a href= + "/ncurses/images/ncurses6-truetype-italics.png"><img width= + "300" src="/ncurses/images/ncurses6-truetype-italics.png" alt= + "ncurses – video attributes with TrueType font"></a></p> + </blockquote> + <h4 id="grep_colors-id"><a name="grep_colors" id= "grep_colors">"grep --color" does not show the right output</a></h4> commit af8b0b7bead6db849549022ebc7662599de21f61 Author: Sven Joachim <[email protected]> Date: Sun Mar 8 09:48:49 2015 +0100 Close bug #775952 diff --git a/debian/changelog b/debian/changelog index 5b04f66..4389d07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ xterm (316-1) UNRELEASED; urgency=low * New upstream release. + - Add configure option --enable-initial-erase to set ptyInitialErase + consistently with manpage, as well as adding a table in manpage to + clarify the relationship between the resources related to the + backarrow key (Closes: #775952). * Refresh Debian patches. * Update years in debian/copyright. commit a16b00f2ade6b7c8c8cd53e40cb6354f80a6feef Author: Sven Joachim <[email protected]> Date: Sun Mar 8 09:46:00 2015 +0100 Update years in debian/copyright diff --git a/debian/changelog b/debian/changelog index 5ceb99d..5b04f66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xterm (316-1) UNRELEASED; urgency=low * New upstream release. * Refresh Debian patches. + * Update years in debian/copyright. -- Sven Joachim <[email protected]> Wed, 04 Mar 2015 17:09:50 +0100 diff --git a/debian/copyright b/debian/copyright index 3292018..fdaebdc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,9 +4,9 @@ This package was debianized by first time by David Martinez Moreno Upstream sources: http://invisible-island.net/xterm/xterm.html -Copyright 1997-2013 by Thomas E. Dickey +Copyright 1997-2015 by Thomas E. Dickey Copyright 1999-2000 by Steve Wall -Copyright 2013 by Ross Combs +Copyright 2013,2014 by Ross Combs All Rights Reserved commit 014561f015da1a0154705be3f62bb9fa8a7fa477 Author: Sven Joachim <[email protected]> Date: Sun Mar 8 09:35:21 2015 +0100 New upstream release diff --git a/debian/changelog b/debian/changelog index 2e0cf88..5ceb99d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xterm (315-1) UNRELEASED; urgency=low +xterm (316-1) UNRELEASED; urgency=low * New upstream release. * Refresh Debian patches. commit 6bd6a94b6909f8bda0c1262e0ce6d84ff92d8a61 Author: Sven Joachim <[email protected]> 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 <[email protected]> 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 [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
