MANIFEST | 3 ++- Tekproc.c | 4 ++-- VTPrsTbl.c | 4 ++-- charsets.c | 4 ++-- cursor.c | 4 ++-- doublechr.c | 4 ++-- minstall.in | 4 ++-- package/debian/changelog | 6 ++++++ package/debian/copyright | 2 +- package/freebsd/Makefile | 2 +- package/xterm.spec | 4 ++-- trace.h | 4 ++-- version.h | 6 +++--- xterm.log.html | 14 +++++++++++++- xtermcap.h | 4 ++-- 15 files changed, 44 insertions(+), 25 deletions(-)
New commits: commit a5ef86eb6abce2eada071b4c97a8571daa990ad5 Author: Sven Joachim <svenj...@gmx.de> Date: Mon Dec 2 18:33:49 2013 +0100 Imported Upstream version 299 diff --git a/MANIFEST b/MANIFEST index 91125e6..1804074 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for xterm-298, version xterm-298 +MANIFEST for xterm-299, version xterm-299 -------------------------------------------------------------------------------- MANIFEST this file 256colres.h resource-definitions for 256-color mode @@ -48,6 +48,7 @@ fontutils.c xterm functions for (re)loading fonts fontutils.h interface of fontutils.c gen-pc-fkeys.pl script to generate extended function-key terminfo graphics.c graphics support functions for 'xterm' +graphics.h interface of graphics.c input.c VT100 key-symbol and function-key translation install-sh install-script (needed by configure) keysym2ucs.c lookup-table for UTF-8 to keysyms diff --git a/Tekproc.c b/Tekproc.c index bb22f3b..3961c6b 100644 --- a/Tekproc.c +++ b/Tekproc.c @@ -1,7 +1,7 @@ -/* $XTermId: Tekproc.c,v 1.193 2012/09/07 09:08:44 tom Exp $ */ +/* $XTermId: Tekproc.c,v 1.194 2012/09/07 09:08:44 tom Exp $ */ /* - * Copyright 2001-2010,2011 by Thomas E. Dickey + * Copyright 2001-2011,2012 by Thomas E. Dickey * * All Rights Reserved * diff --git a/VTPrsTbl.c b/VTPrsTbl.c index 34accc3..9f67957 100644 --- a/VTPrsTbl.c +++ b/VTPrsTbl.c @@ -1,7 +1,7 @@ -/* $XTermId: VTPrsTbl.c,v 1.72 2013/08/21 23:50:44 tom Exp $ */ +/* $XTermId: VTPrsTbl.c,v 1.73 2013/08/21 23:50:44 tom Exp $ */ /* - * Copyright 1999-2011,2012 by Thomas E. Dickey + * Copyright 1999-2012,2013 by Thomas E. Dickey * * All Rights Reserved * diff --git a/charsets.c b/charsets.c index 5644fd1..fbad58a 100644 --- a/charsets.c +++ b/charsets.c @@ -1,4 +1,4 @@ -/* $XTermId: charsets.c,v 1.66 2013/09/16 21:26:10 tom Exp $ */ +/* $XTermId: charsets.c,v 1.67 2013/12/01 16:38:13 tom Exp $ */ /* * Copyright 1998-2011,2013 by Thomas E. Dickey @@ -576,7 +576,7 @@ xtermCharSetOut(XtermWidget xw, IChar *buf, IChar *ptr, int leftset) case nrc_DEC_Spec_Graphic: if (seven > 0x5f && seven <= 0x7e) { #if OPT_WIDE_CHARS - if (screen->utf8_nrc_mode) + if (screen->utf8_mode || screen->utf8_nrc_mode) chr = (int) dec2ucs((unsigned) (seven - 0x5f)); else #endif diff --git a/cursor.c b/cursor.c index 034f5fe..6fdc35d 100644 --- a/cursor.c +++ b/cursor.c @@ -1,7 +1,7 @@ -/* $XTermId: cursor.c,v 1.68 2013/08/08 08:16:40 Iwamoto.Kouichi Exp $ */ +/* $XTermId: cursor.c,v 1.69 2013/08/08 08:16:40 tom Exp $ */ /* - * Copyright 2002-2010,2012 by Thomas E. Dickey + * Copyright 2002-2012,2013 by Thomas E. Dickey * * All Rights Reserved * diff --git a/doublechr.c b/doublechr.c index 36418a5..d228e7f 100644 --- a/doublechr.c +++ b/doublechr.c @@ -1,7 +1,7 @@ -/* $XTermId: doublechr.c,v 1.82 2013/08/30 21:35:13 tom Exp $ */ +/* $XTermId: doublechr.c,v 1.83 2013/08/30 21:35:13 tom Exp $ */ /* - * Copyright 1997-2011,2012 by Thomas E. Dickey + * Copyright 1997-2012,2013 by Thomas E. Dickey * * All Rights Reserved * diff --git a/minstall.in b/minstall.in index bc9e032..86a40bc 100644 --- a/minstall.in +++ b/minstall.in @@ -1,9 +1,9 @@ #!/bin/sh -# $XTermId: minstall.in,v 1.19 2013/04/21 18:58:54 Andres.Perera Exp $ +# $XTermId: minstall.in,v 1.20 2013/04/21 18:58:54 tom Exp $ # ----------------------------------------------------------------------------- # this file is part of xterm # -# Copyright 2001-2011,2012 by Thomas E. Dickey +# Copyright 2001-2012,2013 by Thomas E. Dickey # # All Rights Reserved # diff --git a/package/debian/changelog b/package/debian/changelog index 24e9d76..00907c7 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,3 +1,9 @@ +xterm-dev (299) unstable; urgency=low + + * fix remaining regression from #297 changes + + -- Thomas E. Dickey <dic...@invisible-island.net> Sun, 01 Dec 2013 11:48:42 -0500 + xterm-dev (298) unstable; urgency=low * miscellaneous fixes diff --git a/package/debian/copyright b/package/debian/copyright index 8a1304a..674ea0b 100644 --- a/package/debian/copyright +++ b/package/debian/copyright @@ -35,7 +35,7 @@ authorization. Files: * */* License: MIT-X11 -Copyright 1996-2011 by Thomas E. Dickey +Copyright 1996-2012,2013 by Thomas E. Dickey (date ranges vary, depending on when the respective files were first changed significantly, and run through the most recent change date). diff --git a/package/freebsd/Makefile b/package/freebsd/Makefile index 917fdbb..b3c4f6c 100644 --- a/package/freebsd/Makefile +++ b/package/freebsd/Makefile @@ -5,7 +5,7 @@ # and "make makesum". PORTNAME= xterm -PORTVERSION= 298 +PORTVERSION= 299 CATEGORIES= x11 MASTER_SITES= ftp://invisible-island.net/xterm/ \ CRITICAL diff --git a/package/xterm.spec b/package/xterm.spec index a287d8e..854d4b4 100644 --- a/package/xterm.spec +++ b/package/xterm.spec @@ -1,11 +1,11 @@ -# $XTermId: xterm.spec,v 1.56 2013/09/11 21:16:40 tom Exp $ +# $XTermId: xterm.spec,v 1.57 2013/12/01 16:47:52 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: 298 +Version: 299 Release: 1 License: X11 Group: User Interface/X diff --git a/trace.h b/trace.h index 91f9d36..785b291 100644 --- a/trace.h +++ b/trace.h @@ -1,7 +1,7 @@ -/* $XTermId: trace.h,v 1.71 2013/09/11 21:25:23 tom Exp $ */ +/* $XTermId: trace.h,v 1.72 2013/09/11 21:25:23 tom Exp $ */ /* - * Copyright 1997-2011,2012 by Thomas E. Dickey + * Copyright 1997-2012,2013 by Thomas E. Dickey * * All Rights Reserved * diff --git a/version.h b/version.h index a164e94..50477c5 100644 --- a/version.h +++ b/version.h @@ -1,4 +1,4 @@ -/* $XTermId: version.h,v 1.374 2013/11/27 09:10:11 tom Exp $ */ +/* $XTermId: version.h,v 1.375 2013/12/01 16:38:13 tom Exp $ */ /* * Copyright 1998-2012,2013 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 298 -#define XTERM_DATE 2013-11-27 +#define XTERM_PATCH 299 +#define XTERM_DATE 2013-12-01 #ifndef __vendorversion__ #define __vendorversion__ "XTerm" diff --git a/xterm.log.html b/xterm.log.html index 20fa748..4af7eec 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.1404 2013/11/27 09:09:39 tom Exp $ + $XTermId: xterm.log.html,v 1.1407 2013/12/01 20:56:56 tom Exp $ --> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> @@ -69,6 +69,8 @@ CHANGELOG</a>).</p> <ul> + <li><a href="#xterm_299">Patch #299 - 2013/12/01</a></li> + <li><a href="#xterm_298">Patch #298 - 2013/11/27</a></li> <li><a href="#xterm_297">Patch #297 - 2013/09/10</a></li> @@ -878,6 +880,16 @@ <li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li> </ul> + <h1><a name="xterm_299" id="xterm_299">Patch #299 - + 2013/12/01</a></h1> + + <ul> + <li>fix regression in line-drawing from <a href= + "#xterm_297">patch #297</a> changes for NRCS exposed by change + to <code>assumeAllChars</code> resource in <a href= + "#xterm_298">patch #298</a> (report by Markus Waldeck).</li> + </ul> + <h1><a name="xterm_298" id="xterm_298">Patch #298 - 2013/11/27</a></h1> diff --git a/xtermcap.h b/xtermcap.h index 8c4bc41..3f2590d 100644 --- a/xtermcap.h +++ b/xtermcap.h @@ -1,7 +1,7 @@ -/* $XTermId: xtermcap.h,v 1.19 2013/06/23 15:34:37 tom Exp $ */ +/* $XTermId: xtermcap.h,v 1.20 2013/06/23 15:34:37 tom Exp $ */ /* - * Copyright 2007-2010,2011 by Thomas E. Dickey + * Copyright 2007-2011,2013 by Thomas E. Dickey * * All Rights Reserved * -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1vnxwv-0002yx...@moszumanska.debian.org