about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES6
-rw-r--r--PACKAGE/debian/changelog4
-rw-r--r--PACKAGE/lynx.nsi6
-rw-r--r--PACKAGE/lynx.spec4
-rw-r--r--PACKAGE/version.iss2
-rwxr-xr-xconfigure2
-rw-r--r--configure.in6
-rw-r--r--lynx.cfg6
-rw-r--r--makefile.in4
-rw-r--r--src/LYIcon.rc10
-rw-r--r--src/TRSTable.c13
-rw-r--r--userdefs.h6
12 files changed, 38 insertions, 31 deletions
diff --git a/CHANGES b/CHANGES
index c88fccd6..b9ad4ca6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,12 @@
--- $LynxId: CHANGES,v 1.845 2016/04/26 09:25:09 tom Exp $
+-- $LynxId: CHANGES,v 1.847 2016/09/14 01:09:14 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2016-09-13 (2.8.9dev.10)
+* add a limit-check in case colspan is given as zero for non-nested-table case
+  (report by Sami Liedes) -TD
+
 2016-04-26 (2.8.9dev.9)
 * add workaround for servers such as https://www.xing.com which fail to close
   the connection when they finish sending compressed data.  This relies on
diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog
index da9cf8ae..8f510430 100644
--- a/PACKAGE/debian/changelog
+++ b/PACKAGE/debian/changelog
@@ -1,8 +1,8 @@
-lynx-dev (2.8.9dev.9) unstable; urgency=low
+lynx-dev (2.8.9dev.10) unstable; urgency=low
 
   * maintenance updates
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 10 Apr 2016 20:23:19 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Sep 2016 07:22:22 -0400
 
 lynx-dev (2.8.8dev.16) unstable; urgency=high
 
diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi
index 4ea8e872..131dfe3c 100644
--- a/PACKAGE/lynx.nsi
+++ b/PACKAGE/lynx.nsi
@@ -1,4 +1,4 @@
-; $LynxId: lynx.nsi,v 1.29 2016/04/11 00:42:41 tom Exp $

+; $LynxId: lynx.nsi,v 1.30 2016/09/10 11:22:22 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 "1009"

-!define VERSION_PATCH "dev.9"

+!define VERSION_LEVEL "1010"

+!define VERSION_PATCH "dev.10"

 

 !define SUBKEY "Lynx"

 

diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index 4a88fdf9..942e621c 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,8 +1,8 @@
-# $LynxId: lynx.spec,v 1.36 2016/04/11 00:23:19 tom Exp $
+# $LynxId: lynx.spec,v 1.37 2016/09/10 11:22:22 tom Exp $
 Summary: A text-based Web browser
 Name: lynx
 Version: 2.8.9
-Release: dev.9
+Release: dev.10
 License: GPLv2
 Group: Applications/Internet
 Source: lynx%{version}%{release}.tgz
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index f4c0aafc..7afb9512 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.9"

+#define LYNX_VERSION "2.8.9dev.10"

 

 ; most-recent full release and target

 #define LYNX_RELEASE "2.8.9"

diff --git a/configure b/configure
index 75b927a4..52fed60a 100755
--- a/configure
+++ b/configure
@@ -1274,7 +1274,7 @@ rm conftest.sed
 
 PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.9dev.9
+VERSION=2.8.9dev.10
 
 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 a22bfa3e..3993342a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.282 2016/04/11 00:42:00 tom Exp $
+dnl $LynxId: configure.in,v 1.283 2016/09/10 11:22:22 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -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.9)
+AC_REVISION(2.8.9dev.10)
 
 # 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.9
+VERSION=2.8.9dev.10
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
diff --git a/lynx.cfg b/lynx.cfg
index c72c02bd..d0baa4d9 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,13 +1,13 @@
-# $LynxId: lynx.cfg,v 1.272 2016/04/11 00:23:19 tom Exp $
+# $LynxId: lynx.cfg,v 1.273 2016/09/10 11:22:22 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.9"
+#PRCS LYNX_VERSION "2.8.9dev.10"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Sun, 10 Apr 2016 20:23:19 -0400"
+#PRCS LYNX_DATE "Sat, 10 Sep 2016 07:22:22 -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 df73105c..c664411f 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.156 2016/04/11 00:23:19 tom Exp $
+# $LynxId: makefile.in,v 1.157 2016/09/10 11:22:22 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.9
+LYNX_VERSION	= 2.8.9dev.10
 
 ## 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 ca0d57ce..1aaf0831 100644
--- a/src/LYIcon.rc
+++ b/src/LYIcon.rc
@@ -1,12 +1,12 @@
-// $LynxId: LYIcon.rc,v 1.23 2016/04/11 00:43:06 tom Exp $
+// $LynxId: LYIcon.rc,v 1.24 2016/09/10 11:22:22 tom Exp $
 
 #include <windows.h>
 
 100	ICON	"../samples/lynx.ico"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    2,8,9,1009
-PRODUCTVERSION 2,8,9,1009
+FILEVERSION    2,8,9,1010
+PRODUCTVERSION 2,8,9,1010
 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.1009"
+      VALUE "FileVersion",      "2.8.9.1010"
       VALUE "InternalName",     "Lynx"
       VALUE "LegalCopyright",   "©1997-2016 Thomas E. Dickey"
       VALUE "OriginalFilename", "lynx.exe"
       VALUE "ProductName",      "Lynx - web browser"
-      VALUE "ProductVersion",   "2.8.9.1009"
+      VALUE "ProductVersion",   "2.8.9.1010"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/src/TRSTable.c b/src/TRSTable.c
index c74a405b..9b9b3eb4 100644
--- a/src/TRSTable.c
+++ b/src/TRSTable.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: TRSTable.c,v 1.32 2014/12/16 01:30:48 tom Exp $
+ * $LynxId: TRSTable.c,v 1.34 2016/09/14 01:02:44 tom Exp $
  *		Simple table object
  *		===================
  * Authors
@@ -515,8 +515,9 @@ static int Stbl_reserveCellsInRow(STable_rowinfo *me, int icell,
     int growby = 1 + icell + colspan - me->allocated;
 
     CTRACE2(TRACE_TRST,
-	    (tfp, "TRST:Stbl_reserveCellsInRow(icell=%d, colspan=%d\n",
-	     icell, colspan));
+	    (tfp,
+	     "TRST:Stbl_reserveCellsInRow(icell=%d, colspan=%d) growby=%d\n",
+	     icell, colspan, growby));
     if (growby > 0) {
 	cells = typeRealloc(STable_cellinfo, me->cells,
 			      (unsigned) (me->allocated + growby));
@@ -1242,12 +1243,14 @@ static int get_remaining_colspan(STable_rowinfo *me,
 				 int ncols_sofar)
 {
     int i;
-    int last_colspan = me->ncells ?
-    me->cells[me->ncells - 1].colspan : 1;
+    int last_colspan = (me->ncells
+			? me->cells[me->ncells - 1].colspan
+			: 1);
 
     if (ncolinfo == 0 || me->ncells + last_colspan > ncolinfo) {
 	colspan = HTMIN(TRST_MAXCOLSPAN,
 			ncols_sofar - (me->ncells + last_colspan - 1));
+	colspan = HTMAX(colspan, 0);
     } else {
 	for (i = me->ncells + last_colspan - 1; i < ncolinfo - 1; i++)
 	    if (colinfo[i].cLine == EOCOLG)
diff --git a/userdefs.h b/userdefs.h
index e5ac28f0..55266381 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.319 2016/04/11 00:42:17 tom Exp $
+ * $LynxId: userdefs.h,v 1.320 2016/09/10 11:22:22 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.9"
+#define LYNX_VERSION "2.8.9dev.10"
 #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 "Sun, 10 Apr 2016 20:23:19 -0400"
+#define LYNX_DATE "Sat, 10 Sep 2016 07:22:22 -0400"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-12-02 21:49:15 +0000