about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorThomas E. Dickey <dickey@invisible-island.net>2017-04-29 14:50:20 +0000
committerThomas E. Dickey <dickey@invisible-island.net>2017-04-29 14:50:20 +0000
commite878db685c213ee53b890b38ec5f2a0c92774a66 (patch)
treea05b77c10655da95fd960dd79a07a6221b3ba885 /src
parent2d65308da82f7c091df6abfc7488e2bb33702073 (diff)
downloadlynx-snapshots-e878db685c213ee53b890b38ec5f2a0c92774a66.tar.gz
snapshot of project "lynx", label v2-8-9dev_12a
Diffstat (limited to 'src')
-rw-r--r--src/LYIcon.rc10
-rw-r--r--src/LYStrings.c4
2 files changed, 8 insertions, 6 deletions
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;
 	    }