From: Thomas E. Dickey <dickey@invisible-island.net>
Date: Tue, 4 Aug 2009 00:48:40 +0000 (+0000)
Subject: ncurses 5.7 - patch 20090803
X-Git-Tag: v5.8~78
X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=6374752643292ccd9bf7ee66485efe9aed9e8e48

ncurses 5.7 - patch 20090803

+ add tabs.1 to man/man_db.renames
+ modify lib_addch.c to compensate for removal of wide-character test
  from unctrl() in 20090704 (Debian #539735).
---

diff --git a/NEWS b/NEWS
index c3ec241b..f2ac7a86 100644
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.1414 2009/08/01 20:44:21 tom Exp $
+-- $Id: NEWS,v 1.1416 2009/08/04 00:45:58 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,11 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20090803
+	+ add tabs.1 to man/man_db.renames
+	+ modify lib_addch.c to compensate for removal of wide-character test
+	  from unctrl() in 20090704 (Debian #539735).
+
 20090801
 	+ improve discussion in INSTALL for use of system's tic/infocmp for
 	  cross-compiling and building fallbacks.
diff --git a/dist.mk b/dist.mk
index 83c1589d..d7e04fc7 100644
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.712 2009/07/30 09:04:10 tom Exp $
+# $Id: dist.mk,v 1.713 2009/08/03 21:10:47 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 7
-NCURSES_PATCH = 20090801
+NCURSES_PATCH = 20090803
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/man/man_db.renames b/man/man_db.renames
index ff91eecc..e2388009 100644
--- a/man/man_db.renames
+++ b/man/man_db.renames
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames,v 0.41 2008/10/25 23:24:03 tom Exp $
+# $Id: man_db.renames,v 0.43 2009/08/04 00:30:32 tom Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -152,6 +152,7 @@ putc.3s 			putc.3
 resizeterm.3x			resizeterm.3ncurses
 scanf.3s			scanf.3
 system.3s			system.3
+tabs.1				tabs.1
 term.5				term.5
 term.7				term.7
 terminfo.5			terminfo.5
diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c
index fea78b1e..27a1fb0f 100644
--- a/ncurses/base/lib_addch.c
+++ b/ncurses/base/lib_addch.c
@@ -36,7 +36,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_addch.c,v 1.120 2009/07/25 14:38:19 tom Exp $")
+MODULE_ID("$Id: lib_addch.c,v 1.121 2009/08/04 00:20:09 tom Exp $")
 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 
@@ -274,7 +274,7 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
 		attr_t attr = AttrOf(ch);
 
 		/* handle EILSEQ (i.e., when len >= -1) */
-		if (is8bits(CharOf(ch))) {
+		if (len == -1 && is8bits(CharOf(ch))) {
 		    int rc = OK;
 		    const char *s = NCURSES_SP_NAME(unctrl)
 		      (NCURSES_SP_ARGx (chtype) CharOf(ch));