snapshot of project "lynx", label v2-8-9dev_12a

12 files changed, 36 insertions, 30 deletions

diff --git a/CHANGES b/CHANGES
index 2dd2a488..1118826b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,12 @@
--- $LynxId: CHANGES,v 1.887 2017/04/29 00:35:28 tom Exp $
+-- $LynxId: CHANGES,v 1.889 2017/04/29 14:43:40 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2017-04-29 (2.8.9dev.13)
+* amend fix for Debian #841155, adding check for special case where the
+  expected number of cells is zero (report by Larry Hynes) -TD
+
 2017-04-28 (2.8.9dev.12)
 * correct logic in cell2char(), which gave up too early in determining the
   number of cells needed for a multibyte string in the editable text-fields
@@ -13,7 +17,7 @@ Changes since Lynx 2.8 release
 * cleanup some of the user's guide formatting, e.g., for quote-characters -TD
 * consistently use "_" in command-line options table and manual page, to work
   with program logic that treats "-" as "_", but not the reverse (report by
-  Larry Hines) -TD
+  Larry Hynes) -TD
 * improved several configure macros:  CF_ADD_CFLAGS, CF_CC_ENV_FLAGS,
   CF_GNU_SOURCE, CF_LARGEFILE, CF_MATH_LIB, CF_PROG_LINT, CF_SRAND,
   CF_XOPEN_SOURCE -TD
diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog
index 29d468b6..18788512 100644
--- a/PACKAGE/debian/changelog
+++ b/PACKAGE/debian/changelog
@@ -1,8 +1,8 @@
-lynx-dev (2.8.9dev.12) unstable; urgency=low
+lynx-dev (2.8.9dev.13) unstable; urgency=low
 
   * maintenance updates
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 23 Nov 2016 13:22:53 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 29 Apr 2017 08:47:15 -0400
 
 lynx-dev (2.8.8dev.16) unstable; urgency=high
 
diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi
index 23cfd249..08cb9c96 100644
--- a/PACKAGE/lynx.nsi
+++ b/PACKAGE/lynx.nsi
@@ -1,4 +1,4 @@
-; $LynxId: lynx.nsi,v 1.33 2017/01/02 02:22:38 tom Exp $

+; $LynxId: lynx.nsi,v 1.34 2017/04/29 12:47:15 tom Exp $

 ; Script originally generated with the Venis Install Wizard, but customized.

 ; The Inno Setup script is preferred; but this can be built via cross-compiling.

 

@@ -9,8 +9,8 @@
 !define VERSION_EPOCH "2"

 !define VERSION_MAJOR "8"

 !define VERSION_MINOR "9"

-!define VERSION_LEVEL "1012"

-!define VERSION_PATCH "dev.12"

+!define VERSION_LEVEL "1013"

+!define VERSION_PATCH "dev.13"

 

 !define SUBKEY "Lynx"

 

diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index 1b7f8241..1445aeb1 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,8 +1,8 @@
-# $LynxId: lynx.spec,v 1.39 2016/11/23 18:22:52 tom Exp $
+# $LynxId: lynx.spec,v 1.40 2017/04/29 12:47:15 tom Exp $
 Summary: A text-based Web browser
 Name: lynx
 Version: 2.8.9
-Release: dev.12
+Release: dev.13
 License: GPLv2
 Group: Applications/Internet
 Source: lynx%{version}%{release}.tgz
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index 33f5769f..a2b5727d 100644
--- a/PACKAGE/version.iss
+++ b/PACKAGE/version.iss
@@ -1,7 +1,7 @@
 ; version used for Inno Setup files.

 

 ; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$

-#define LYNX_VERSION "2.8.9dev.12"

+#define LYNX_VERSION "2.8.9dev.13"

 

 ; most-recent full release and target

 #define LYNX_RELEASE "2.8.9"

diff --git a/configure b/configure
index 436392f2..e1d071d5 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in 2.8.9dev.12.
+# From configure.in 2.8.9dev.13.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20150926.
 #
@@ -1274,7 +1274,7 @@ rm conftest.sed
 
 PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.9dev.12
+VERSION=2.8.9dev.13
 
 echo "$as_me:1279: checking for DESTDIR" >&5
 echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6
diff --git a/configure.in b/configure.in
index 57ff30ae..6f873236 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.285 2016/11/24 12:27:19 tom Exp $
+dnl $LynxId: configure.in,v 1.287 2017/04/29 14:49:46 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -7,7 +7,7 @@ dnl by T.E.Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
 dnl
 dnl ---------------------------------------------------------------------------
-dnl Copyright 1997-2015,2016 by Thomas E. Dickey
+dnl Copyright 1997-2016,2017 by Thomas E. Dickey
 dnl
 dnl Permission to use, copy, modify, and distribute this software and its
 dnl documentation for any purpose and without fee is hereby granted,
@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
 dnl
 dnl ask PRCS to plug-in the project-version for the configure-script.
 dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.8.9dev.12)
+AC_REVISION(2.8.9dev.13)
 
 # Save the original $CFLAGS so we can distinguish whether the user set those
 # in the environment, or whether autoconf added -O and -g options:
@@ -64,7 +64,7 @@ AC_ARG_PROGRAM
 PACKAGE=lynx
 dnl ask PRCS to plug-in the project-version for the packages.
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.9dev.12
+VERSION=2.8.9dev.13
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
diff --git a/lynx.cfg b/lynx.cfg
index 741a486c..e2897870 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,13 +1,13 @@
-# $LynxId: lynx.cfg,v 1.279 2016/12/23 07:47:02 tom Exp $
+# $LynxId: lynx.cfg,v 1.280 2017/04/29 12:47:15 tom Exp $
 # lynx.cfg file.
 # The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
 # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-#PRCS LYNX_VERSION "2.8.9dev.12"
+#PRCS LYNX_VERSION "2.8.9dev.13"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Thu, 24 Nov 2016 07:27:19 -0500"
+#PRCS LYNX_DATE "Sat, 29 Apr 2017 08:47:15 -0400"
 #
 # Definition pairs are of the form  VARIABLE:DEFINITION
 # NO spaces are allowed between the pair items.
diff --git a/makefile.in b/makefile.in
index a775ff9d..705cb53d 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.159 2016/11/24 12:27:19 tom Exp $
+# $LynxId: makefile.in,v 1.160 2017/04/29 12:47:15 tom Exp $
 ##makefile for lynx
 
 SHELL		= @CONFIG_SHELL@
@@ -46,7 +46,7 @@ TAR_UP		= $(TAR) @TAR_UP_OPTIONS@ @TAR_PIPE_OPTIONS@
 TAR_DOWN	= $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@
 
 # $Format: "LYNX_VERSION	= $ProjectVersion$"$
-LYNX_VERSION	= 2.8.9dev.12
+LYNX_VERSION	= 2.8.9dev.13
 
 ## This is the version which we are developing (or, upon release, make this
 ## the same).  Use no dots in the name, since it must work on VMS and MS-DOS.
diff --git a/src/LYIcon.rc b/src/LYIcon.rc
index 1112dde5..b3515772 100644
--- a/src/LYIcon.rc
+++ b/src/LYIcon.rc
@@ -1,12 +1,12 @@
-// $LynxId: LYIcon.rc,v 1.27 2017/01/02 02:22:38 tom Exp $
+// $LynxId: LYIcon.rc,v 1.28 2017/04/29 12:47:15 tom Exp $
 
 #include <windows.h>
 
 100	ICON	"../samples/lynx.ico"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    2,8,9,1012
-PRODUCTVERSION 2,8,9,1012
+FILEVERSION    2,8,9,1013
+PRODUCTVERSION 2,8,9,1013
 FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
 FILEFLAGS      0
 FILEOS         VOS_NT_WINDOWS32
@@ -19,12 +19,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName",      "http://invisible-island.net/lynx"
       VALUE "FileDescription",  "Lynx - web browser"
-      VALUE "FileVersion",      "2.8.9.1012"
+      VALUE "FileVersion",      "2.8.9.1013"
       VALUE "InternalName",     "Lynx"
       VALUE "LegalCopyright",   "©1997-2017 Thomas E. Dickey"
       VALUE "OriginalFilename", "lynx.exe"
       VALUE "ProductName",      "Lynx - web browser"
-      VALUE "ProductVersion",   "2.8.9.1012"
+      VALUE "ProductVersion",   "2.8.9.1013"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/src/LYStrings.c b/src/LYStrings.c
index 622add8b..9f0ef0f1 100644
--- a/src/LYStrings.c
+++ b/src/LYStrings.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYStrings.c,v 1.266 2017/04/29 00:32:21 tom Exp $ */
+/* $LynxId: LYStrings.c,v 1.267 2017/04/29 14:38:32 tom Exp $ */
 #include <HTUtils.h>
 #include <HTCJK.h>
 #include <UCAux.h>
@@ -3112,6 +3112,8 @@ static int cell2char(char *s, int cells)
 	    have = LYstrExtent2(s, pos);
 	    CTRACE_EDIT((tfp, "  %2d:%2d:%.*s\n", pos, have, pos, s));
 	    if (have >= cells) {
+		if (cells <= 0)
+		    break;
 		/* the best solution is the one with the most bytes */
 		best = pos;
 	    }
diff --git a/userdefs.h b/userdefs.h
index 5a891be8..018f1a3a 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.324 2017/01/02 02:22:38 tom Exp $
+ * $LynxId: userdefs.h,v 1.325 2017/04/29 12:47:15 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
@@ -1442,11 +1442,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.9dev.12"
+#define LYNX_VERSION "2.8.9dev.13"
 #define LYNX_WWW_HOME "http://lynx.invisible-island.net/"
 #define LYNX_WWW_DIST "http://lynx.invisible-island.net/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Thu, 24 Nov 2016 07:27:19 -0500"
+#define LYNX_DATE "Sat, 29 Apr 2017 08:47:15 -0400"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */