MANIFEST | 2 +-
button.c | 4 ++--
package/debian/changelog | 6 ++++++
package/freebsd/Makefile | 2 +-
package/xterm.spec | 4 ++--
version.h | 6 +++---
xterm.log.html | 13 ++++++++++++-
7 files changed, 27 insertions(+), 10 deletions(-)
New commits:
commit 06a538fbafd3b224fe7a994fb68db0c1896b2ef0
Author: Sven Joachim <svenj...@gmx.de>
Date: Mon Sep 29 17:08:30 2014 +0200
Imported Upstream version 312
diff --git a/MANIFEST b/MANIFEST
index 634ec2c..e9068a6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-311, version xterm-311
+MANIFEST for xterm-312, version xterm-312
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff --git a/button.c b/button.c
index 77929c9..8dd7390 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.481 2014/09/18 00:17:35 tom Exp $ */
+/* $XTermId: button.c,v 1.482 2014/09/26 23:58:14 tom Exp $ */
/*
* Copyright 1999-2013,2014 by Thomas E. Dickey
@@ -3257,7 +3257,7 @@ do_select_regex(TScreen *screen, CELL *startc, CELL *endc)
int start_col = indexToCol(indexed, len, start_inx);
int finis_col = indexToCol(indexed, len, finis_inx);
- if (start_col >= actual &&
+ if (start_col <= actual &&
actual < finis_col) {
int test = finis_col - start_col;
if (best_len < test) {
diff --git a/package/debian/changelog b/package/debian/changelog
index 92638d6..2a486f8 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+xterm-dev (312) unstable; urgency=low
+
+ * maintenance updates
+
+ -- Thomas E. Dickey <dic...@invisible-island.net> Fri, 26 Sep 2014 18:42:15
-0400
+
xterm-dev (311) unstable; urgency=low
* maintenance updates
diff --git a/package/freebsd/Makefile b/package/freebsd/Makefile
index 9f4c4fc..9c22d21 100644
--- a/package/freebsd/Makefile
+++ b/package/freebsd/Makefile
@@ -5,7 +5,7 @@
# and "make makesum".
PORTNAME= xterm
-PORTVERSION= 311
+PORTVERSION= 312
CATEGORIES= x11
MASTER_SITES= ftp://invisible-island.net/xterm/ \
CRITICAL
diff --git a/package/xterm.spec b/package/xterm.spec
index c9a0fcc..a9100d0 100644
--- a/package/xterm.spec
+++ b/package/xterm.spec
@@ -1,11 +1,11 @@
-# $XTermId: xterm.spec,v 1.76 2014/07/28 21:36:30 tom Exp $
+# $XTermId: xterm.spec,v 1.77 2014/09/26 22:42:15 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: 311
+Version: 312
Release: 1
License: X11
Group: User Interface/X
diff --git a/version.h b/version.h
index b7ef006..30be6f3 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.397 2014/09/18 21:12:19 tom Exp $ */
+/* $XTermId: version.h,v 1.399 2014/09/29 00:37:50 tom Exp $ */
/*
* Copyright 1998-2013,2014 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 311
-#define XTERM_DATE 2014-09-18
+#define XTERM_PATCH 312
+#define XTERM_DATE 2014-09-28
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index 91626de..6b83682 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.1522 2014/09/18 21:11:45 tom Exp $
+ $XTermId: xterm.log.html,v 1.1526 2014/09/29 00:39:23 tom Exp $
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
@@ -72,6 +72,8 @@
CHANGELOG</a>).</p>
<ul>
+ <li><a href="#xterm_312">Patch #312 - 2014/09/28</a></li>
+
<li><a href="#xterm_311">Patch #311 - 2014/09/18</a></li>
<li><a href="#xterm_310">Patch #310 - 2014/07/25</a></li>
@@ -907,6 +909,15 @@
<li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li>
</ul>
+ <h1><a name="xterm_312" id="xterm_312">Patch #312 -
+ 2014/09/28</a></h1>
+
+ <ul>
+ <li>undo change to <code>do_select_regex()</code> in <a href=
+ "#xterm_311">patch #311</a> (reports by H Merijn Brand,
+ Sven-Haegar Koch, Debian #762978).</li>
+ </ul>
+
<h1><a name="xterm_311" id="xterm_311">Patch #311 -
2014/09/18</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/e1xyck5-00064h...@moszumanska.debian.org
