[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xterm: Changes to 'debian-unstable'



 MANIFEST         |    2 +-
 Makefile.in      |    2 +-
 configure        |    2 +-
 configure.in     |    4 ++--
 debian/changelog |    8 ++++++++
 util.c           |   10 ++++++----
 version.h        |    4 ++--
 xterm.log.html   |   17 +++++++++++++++--
 8 files changed, 36 insertions(+), 13 deletions(-)

New commits:
commit 6db80122ef8aa20bf37e01177f26df65f8f0cdca
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Jan 6 10:17:56 2008 +0100

    * New upstream release
      + undo change to getXtermCell() from patch #230 using PACK_PAIR macro
        (closes: #459014, analysis by Caetano Jimenez Carezzato).

diff --git a/debian/changelog b/debian/changelog
index fc74f8f..6997652 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xterm (231-1) unstable; urgency=low
+
+  * New upstream release
+    + undo change to getXtermCell() from patch #230 using PACK_PAIR macro
+      (closes: #459014, analysis by Caetano Jimenez Carezzato).
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 06 Jan 2008 10:13:28 +0100
+
 xterm (230-1) unstable; urgency=low
 
   * New upstream release.

commit 74606566b9ef5f4355eadb58c822c9f38728c70a
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Jan 6 10:12:18 2008 +0100

    Import xterm-231.

diff --git a/MANIFEST b/MANIFEST
index d6339d4..6e491e5 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-229o, version xterm-230
+MANIFEST for xterm-231, version xterm-231
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 256colres.h                     resource-definitions for 256-color mode
diff --git a/Makefile.in b/Makefile.in
index ff90a4a..f15ad49 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.154 2007/12/30 16:39:48 tom Exp $
+## $XTermId: Makefile.in,v 1.155 2008/01/05 14:26:52 tom Exp $
 ##
 ## Copyright 2002-2006,2007 by Thomas E. Dickey
 ##
@@ -221,6 +221,9 @@ install-full :: $(MANDIR)
 @no_appsdir@	@echo installing $(APPSDIR)/UXTerm
 @no_appsdir@	@sed -e s/XTerm/$(CLASS)/ $(srcdir)/UXTerm.ad >XTerm.tmp
 @no_appsdir@	@$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/UXTerm
+@no_appsdir@	@echo installing $(APPSDIR)/KOI8RXTerm
+@no_appsdir@	@sed -e s/XTerm/$(CLASS)/ $(srcdir)/KOI8RXTerm.ad >XTerm.tmp
+@no_appsdir@	@$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/KOI8RXTerm
 @no_appsdir@	@rm -f XTerm.tmp
 @no_icondir@	@echo "... installed app-defaults"
 
diff --git a/configure b/configure
index 6c3d984..5c43852 100755
--- a/configure
+++ b/configure
@@ -743,7 +743,7 @@ Optional Features:
   --disable-rightbar      disable right-scrollbar support
   --disable-samename      disable check for redundant name-change
   --disable-session-mgt   disable support for session management
-  --enable-tcap-fkeys     disable termcap function-keys support
+  --disable-tcap-fkeys    disable termcap function-keys support
   --enable-tcap-query     compile-in termcap-query support
   --disable-tek4014       disable tek4014 emulation
   --enable-toolbar        compile-in toolbar for pulldown menus
diff --git a/configure.in b/configure.in
index b1fe245..693355c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $XTermId: configure.in,v 1.239 2007/12/31 17:21:31 tom Exp $
+dnl $XTermId: configure.in,v 1.240 2008/01/05 14:26:52 tom Exp $
 dnl
 dnl ---------------------------------------------------------------------------
 dnl
@@ -722,7 +722,7 @@ test "$enable_session_mgt" = no && AC_DEFINE(OPT_SESSION_MGT,0)
 
 AC_MSG_CHECKING(if you want to use termcap function-keys)
 CF_ARG_DISABLE(tcap-fkeys,
-	[  --enable-tcap-fkeys     disable termcap function-keys support],
+	[  --disable-tcap-fkeys    disable termcap function-keys support],
 	[enable_tcap_fkeys=no],
 	[enable_tcap_fkeys=yes])
 AC_MSG_RESULT($enable_tcap_fkeys)
diff --git a/util.c b/util.c
index c6f2f95..03da20b 100644
--- a/util.c
+++ b/util.c
@@ -1,4 +1,4 @@
-/* $XTermId: util.c,v 1.403 2007/12/31 15:41:19 tom Exp $ */
+/* $XTermId: util.c,v 1.404 2008/01/05 14:26:52 tom Exp $ */
 
 /*
  * Copyright 1999-2006,2007 by Thomas E. Dickey
@@ -3497,9 +3497,11 @@ ClearCurBackground(XtermWidget xw,
 unsigned
 getXtermCell(TScreen * screen, int row, int col)
 {
-    return PACK_PAIR(SCRN_BUF_CHARS(screen, row),
-		     SCRN_BUF_WIDEC(screen, row),
-		     col);
+    unsigned ch = SCRN_BUF_CHARS(screen, row)[col];
+    if_OPT_WIDE_CHARS(screen, {
+	ch |= (SCRN_BUF_WIDEC(screen, row)[col] << 8);
+    });
+    return ch;
 }
 
 /*
diff --git a/version.h b/version.h
index b30ee58..6c19c76 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.286 2007/11/10 01:36:34 tom Exp $ */
+/* $XTermId: version.h,v 1.287 2008/01/05 14:26:52 tom Exp $ */
 
 /*
  * These definitions are used to build the string that's printed in response to
@@ -6,7 +6,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   230
+#define XTERM_PATCH   231
 
 #ifndef __vendorversion__
 #define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index d19c2ac..70ff93d 100644
--- a/xterm.log.html
+++ b/xterm.log.html
@@ -20,7 +20,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.log.html,v 1.630 2007/12/31 23:03:01 tom Exp $
+  $XTermId: xterm.log.html,v 1.632 2008/01/06 01:53:25 tom Exp $
   -->
 <HTML>
 <HEAD>
@@ -45,6 +45,7 @@ Most of these are summarized in the XFree86 CHANGELOG
 is the latest version of this file.
 
 <UL>
+<LI><A HREF="#xterm_231">Patch #231 - 2008/01/05</A>
 <LI><A HREF="#xterm_230">Patch #230 - 2007/12/31</A>
 <LI><A HREF="#xterm_229">Patch #229 - 2007/8/12</A>
 <LI><A HREF="#xterm_228">Patch #228 - 2007/7/22</A>
@@ -278,6 +279,18 @@ is the latest version of this file.
 <LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
 </UL>
 
+<H1><A NAME="xterm_231">Patch #231 - 2008/01/05</A></H1>
+<ul>
+	<li>undo change to <code>getXtermCell()</code> from patch #230
+	    using <code>PACK_PAIR</code> macro (Debian #459014, analysis by
+	    Caetano Jimenez Carezzato).
+
+	<li>minor documentation fixes (patch by Slava Semushin)
+
+	<li>add makefile actions to install KOI8RXTerm app-defaults file
+	    (patch by Julien Cristau).
+</ul>
+
 <H1><A NAME="xterm_230">Patch #230 - 2007/12/31</A></H1>
 <ul>
 	<li>add <code>quietGrab</code> resource, which when true, suppresses
@@ -352,7 +365,7 @@ is the latest version of this file.
 	    on or off.
 
 	<li>add <code>highlightColorMode</code> resource to separate the
-	    new (since patch #225) highlighting with both text- and
+	    new (since <a href="#xterm_225">patch #225</a>) highlighting with both text- and
 	    background-colors (prompted by report/example by Thomas Wolff).
 
 	<li>add <em>Keep Selection</em> menu entry to turn the 


Reply to: