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

13 files changed, 45 insertions, 42 deletions

diff --git a/CHANGES b/CHANGES
index 1d088913..3a8fb316 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,11 @@
--- $LynxId: CHANGES,v 1.894 2017/05/11 01:03:49 tom Exp $
+-- $LynxId: CHANGES,v 1.896 2017/05/11 22:44:32 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2017-05-11 (2.8.9dev.15)
+* build-fix for PGI compilers, e.g., symbol conflicts -TD
+
 2017-05-10 (2.8.9dev.14)
 * amend fix for Debian #841155, adding check for complete multibyte strings to
   decide when the cell-limit has been met (Debian #862148) -TD
diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog
index 56e65d47..e19b97f9 100644
--- a/PACKAGE/debian/changelog
+++ b/PACKAGE/debian/changelog
@@ -1,8 +1,8 @@
-lynx-dev (2.8.9dev.14) unstable; urgency=low
+lynx-dev (2.8.9dev.15) unstable; urgency=low
 
   * maintenance updates
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 30 Apr 2017 12:02:52 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 11 May 2017 17:22:30 -0400
 
 lynx-dev (2.8.8dev.16) unstable; urgency=high
 
diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi
index 6615fc5d..b7e594bc 100644
--- a/PACKAGE/lynx.nsi
+++ b/PACKAGE/lynx.nsi
@@ -1,4 +1,4 @@
-; $LynxId: lynx.nsi,v 1.35 2017/04/30 16:02:52 tom Exp $

+; $LynxId: lynx.nsi,v 1.36 2017/05/11 21:22:30 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 "1014"

-!define VERSION_PATCH "dev.14"

+!define VERSION_LEVEL "1015"

+!define VERSION_PATCH "dev.15"

 

 !define SUBKEY "Lynx"

 

diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index 33db2f9c..63dbde3b 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,8 +1,8 @@
-# $LynxId: lynx.spec,v 1.41 2017/04/30 16:02:52 tom Exp $
+# $LynxId: lynx.spec,v 1.42 2017/05/11 21:22:30 tom Exp $
 Summary: A text-based Web browser
 Name: lynx
 Version: 2.8.9
-Release: dev.14
+Release: dev.15
 License: GPLv2
 Group: Applications/Internet
 Source: lynx%{version}%{release}.tgz
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index 211413d9..588852f5 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.14"

+#define LYNX_VERSION "2.8.9dev.15"

 

 ; most-recent full release and target

 #define LYNX_RELEASE "2.8.9"

diff --git a/configure b/configure
index f1499411..19e81a2b 100755
--- a/configure
+++ b/configure
@@ -1274,7 +1274,7 @@ rm conftest.sed
 
 PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.9dev.14
+VERSION=2.8.9dev.15
 
 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 df394ff9..a503a0bc 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.288 2017/04/30 16:02:52 tom Exp $
+dnl $LynxId: configure.in,v 1.289 2017/05/11 21:22:30 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.14)
+AC_REVISION(2.8.9dev.15)
 
 # 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.14
+VERSION=2.8.9dev.15
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
diff --git a/lynx.cfg b/lynx.cfg
index a1568be6..bf76661d 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,13 +1,13 @@
-# $LynxId: lynx.cfg,v 1.281 2017/04/30 16:02:52 tom Exp $
+# $LynxId: lynx.cfg,v 1.282 2017/05/11 21:22:30 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.14"
+#PRCS LYNX_VERSION "2.8.9dev.15"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Sun, 30 Apr 2017 12:02:52 -0400"
+#PRCS LYNX_DATE "Thu, 11 May 2017 17:22:30 -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 74adb01e..7bd87c13 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.161 2017/04/30 16:02:52 tom Exp $
+# $LynxId: makefile.in,v 1.162 2017/05/11 21:22:30 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.14
+LYNX_VERSION	= 2.8.9dev.15
 
 ## 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 4bcdaf94..5e867624 100644
--- a/src/LYIcon.rc
+++ b/src/LYIcon.rc
@@ -1,12 +1,12 @@
-// $LynxId: LYIcon.rc,v 1.29 2017/04/30 16:02:52 tom Exp $
+// $LynxId: LYIcon.rc,v 1.30 2017/05/11 21:22:30 tom Exp $
 
 #include <windows.h>
 
 100	ICON	"../samples/lynx.ico"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    2,8,9,1014
-PRODUCTVERSION 2,8,9,1014
+FILEVERSION    2,8,9,1015
+PRODUCTVERSION 2,8,9,1015
 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.1014"
+      VALUE "FileVersion",      "2.8.9.1015"
       VALUE "InternalName",     "Lynx"
       VALUE "LegalCopyright",   "©1997-2017 Thomas E. Dickey"
       VALUE "OriginalFilename", "lynx.exe"
       VALUE "ProductName",      "Lynx - web browser"
-      VALUE "ProductVersion",   "2.8.9.1014"
+      VALUE "ProductVersion",   "2.8.9.1015"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index b2bfbdd2..b44731eb 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMainLoop.c,v 1.233 2016/11/24 19:50:02 tom Exp $
+ * $LynxId: LYMainLoop.c,v 1.234 2017/05/11 21:22:06 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAccess.h>
@@ -7879,7 +7879,7 @@ static void HTGotoURLs_free(void)
  */
 void HTAddGotoURL(char *url)
 {
-    char *copy = NULL;
+    char *mycopy = NULL;
     char *old;
     HTList *cur;
 
@@ -7887,26 +7887,26 @@ void HTAddGotoURL(char *url)
 	return;
 
     CTRACE((tfp, "HTAddGotoURL %s\n", url));
-    StrAllocCopy(copy, url);
+    StrAllocCopy(mycopy, url);
 
     if (!Goto_URLs) {
 	Goto_URLs = HTList_new();
 #ifdef LY_FIND_LEAKS
 	atexit(HTGotoURLs_free);
 #endif
-	HTList_addObject(Goto_URLs, copy);
+	HTList_addObject(Goto_URLs, mycopy);
 	return;
     }
 
     cur = Goto_URLs;
     while (NULL != (old = (char *) HTList_nextObject(cur))) {
-	if (!strcmp(old, copy)) {
+	if (!strcmp(old, mycopy)) {
 	    HTList_removeObject(Goto_URLs, old);
 	    FREE(old);
 	    break;
 	}
     }
-    HTList_addObject(Goto_URLs, copy);
+    HTList_addObject(Goto_URLs, mycopy);
 
     return;
 }
diff --git a/src/LYUtils.c b/src/LYUtils.c
index f9f4fb6a..af6b2f31 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYUtils.c,v 1.276 2016/11/24 15:35:29 tom Exp $
+ * $LynxId: LYUtils.c,v 1.277 2017/05/11 22:33:05 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTCP.h>
@@ -499,7 +499,7 @@ static BOOL show_whereis_targets(int flag,
 				 int TargetEmphasisON,
 				 int utf_flag)
 {
-    const char *Data = NULL;
+    const char *mydata = NULL;
     const char *cp;
     char *theData = NULL;
     char buffer[MAX_LINE];
@@ -551,10 +551,10 @@ static BOOL show_whereis_targets(int flag,
 	     * Recursively skip hits that end before this link, and break out
 	     * if there is no hit beyond those.  -FM
 	     */
-	    Data = theData;
+	    mydata = theData;
 	    while ((Offset < hoffset) &&
 		   ((Offset + tLen) <= hoffset)) {
-		data = (Data + tlen);
+		data = (mydata + tlen);
 		offset = (Offset + tLen);
 		if (((cp = LYno_attr_mb_strstr(data,
 					       target,
@@ -562,7 +562,7 @@ static BOOL show_whereis_targets(int flag,
 					       &HitOffset,
 					       &LenNeeded)) != NULL)
 		    && (offset + LenNeeded) < LYcols) {
-		    Data = cp;
+		    mydata = cp;
 		    Offset = (offset + HitOffset);
 		} else {
 		    goto highlight_search_done;
@@ -737,7 +737,7 @@ static BOOL show_whereis_targets(int flag,
 		 */
 		    && ((cp =
 			 LYno_attr_mb_strstr(data = SKIP_GLYPHS(utf_flag,
-								Data,
+								mydata,
 								offset - Offset),
 					     target,
 					     utf_flag, YES,
@@ -756,7 +756,7 @@ static BOOL show_whereis_targets(int flag,
 		     * Set up the data and offset for the hit, and let the code
 		     * for within hightext hits handle it.  -FM
 		     */
-		    Data = cp;
+		    mydata = cp;
 		    Offset = (offset + HitOffset);
 		    data = buffer;
 		    offset = hoffset;
@@ -937,7 +937,7 @@ static BOOL show_whereis_targets(int flag,
 		 */
 		    && ((cp =
 			 LYno_attr_mb_strstr(data = SKIP_GLYPHS(utf_flag,
-								Data,
+								mydata,
 								offset - Offset),
 					     target,
 					     utf_flag, YES,
@@ -959,7 +959,7 @@ static BOOL show_whereis_targets(int flag,
 		     */
 		    if ((HitOffset + (offset + tLen)) >= (hoffset + hLen)) {
 			offset = (HitOffset + offset);
-			data = SKIP_GLYPHS(utf_flag, Data, offset - hoffset);
+			data = SKIP_GLYPHS(utf_flag, mydata, offset - hoffset);
 			if (utf_flag) {
 			    LYrefresh();
 			}
@@ -1042,7 +1042,7 @@ static BOOL show_whereis_targets(int flag,
 			    LYstopTargetEmphasis();
 			}
 		    } else {
-			Data = cp;
+			mydata = cp;
 			Offset = (offset + HitOffset);
 			data = buffer;
 			offset = hoffset;
diff --git a/userdefs.h b/userdefs.h
index 9439a09e..c232d4eb 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.326 2017/04/30 16:02:52 tom Exp $
+ * $LynxId: userdefs.h,v 1.327 2017/05/11 21:22:30 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.14"
+#define LYNX_VERSION "2.8.9dev.15"
 #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, 30 Apr 2017 12:02:52 -0400"
+#define LYNX_DATE "Thu, 11 May 2017 17:22:30 -0400"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */