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

16 files changed, 43 insertions, 41 deletions

diff --git a/CHANGES b/CHANGES
index c0cd14c6..7ad3597f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,11 @@
--- $LynxId: CHANGES,v 1.766 2014/12/21 21:30:08 tom Exp $
+-- $LynxId: CHANGES,v 1.769 2015/01/02 12:32:23 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2015-01-02 (2.8.9dev.3)
+* build-fixes for djgpp 2.04 and gcc 4.8.4 using Watt-32 -GV
+
 2014-12-21 (2.8.9dev.2)
 * correct an inconsistent check for reload using isLYNXCGI() in the
   options-screen -TD
@@ -7915,7 +7918,7 @@ recently, FreeBSD 4.1, NetBSD 1.5 and OpenBSD 2.8 (curses/ncurses).
 * correct order of params for non-Unix use of HTAddParam in LYBookmark.c
   (reported by DK) -TD
 
-1998-12-31
+1998-12-31 (2.8.2dev.12a)
 * delete unused 'PREVAIL' color-style code from HTML.c, merge a couple of
   sections of logic with TrimColorClass, and change Style_className to
   a dynamically-allocated string - TD
@@ -8454,7 +8457,7 @@ recently, FreeBSD 4.1, NetBSD 1.5 and OpenBSD 2.8 (curses/ncurses).
 * first cut of integrating Jim Spath's changes to incorporate message library
   support - JES, TD
 
-1998-09-20
+1998-09-20 (2.8.1dev.29-intl)
 * edited files for language hooks (JES):
   src/HTAlert.c src/HTInit.c src/HTML.c src/LYBookmark.c src/LYCgi.c
   src/LYClean.c src/LYCookie.c src/LYCurses.c src/LYDownload.c src/LYEdit.c
diff --git a/COPYHEADER b/COPYHEADER
index 30587f9d..063aaf69 100644
--- a/COPYHEADER
+++ b/COPYHEADER
@@ -1,4 +1,4 @@
-Copyright 1997-2013,2014 Thomas E. Dickey
+Copyright 1997-2014,2015 Thomas E. Dickey
 
 This copyright notice must be included in all copies or substantial
 portions of Lynx.  It outlines rights and restrictions for Lynx which
@@ -80,5 +80,5 @@ For reference, below is the original copyright notice for Lynx (2.4.2).
 */
 ------------------------------------------------------------------------------
 -- vile:txtmode fc=72 noti
--- $LynxId: COPYHEADER,v 1.11 2014/01/09 00:19:22 tom Exp $
+-- $LynxId: COPYHEADER,v 1.12 2015/01/02 12:26:47 tom Exp $
 ------------------------------------------------------------------------------
diff --git a/COPYHEADER.asc b/COPYHEADER.asc
index ced2495c..ea797f14 100644
--- a/COPYHEADER.asc
+++ b/COPYHEADER.asc
@@ -2,7 +2,7 @@
 Version: GnuPG v1.4.10 (GNU/Linux)
 Comment: See http://invisible-island.net/public/public.html for info
 
-iEYEABECAAYFAlLN6xgACgkQcCNT4PfkjtsllwCfQQMuuTgr3BFvBSEzFWW7IDyi
-UNMAnjdg4UMMG8jYxiqZIe8M7i8yEhzl
-=OkY+
+iEYEABECAAYFAlSmkEIACgkQcCNT4PfkjtvDHgCcCuPQT6btzjHea86OJcHDxdzA
+ykwAoMQ1m8J2Po3yv31ULFXSTS/yDmWH
+=BGPK
 -----END PGP SIGNATURE-----
diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog
index 2fc69962..fbce1533 100644
--- a/PACKAGE/debian/changelog
+++ b/PACKAGE/debian/changelog
@@ -1,8 +1,8 @@
-lynx-dev (2.8.9dev.2) unstable; urgency=low
+lynx-dev (2.8.9dev.3) unstable; urgency=low
 
   * maintenance updates
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 16 Mar 2014 11:03:40 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 30 Dec 2014 16:37:40 -0500
 
 lynx-dev (2.8.8dev.16) unstable; urgency=high
 
diff --git a/PACKAGE/debian/copyright b/PACKAGE/debian/copyright
index 3dc73997..96e80cb7 100644
--- a/PACKAGE/debian/copyright
+++ b/PACKAGE/debian/copyright
@@ -47,7 +47,7 @@ For reference, below is the original copyright notice for Lynx (2.4.2).
 
 Files: aclocal.m4
 Licence: other-BSD
-Copyright: 1997-2013,2014 by Thomas E. Dickey
+Copyright: 1997-2014,2015 by Thomas E. Dickey
     Permission to use, copy, modify, and distribute this software and its
     documentation for any purpose and without fee is hereby granted,
     provided that the above copyright notice appear in all copies and that
@@ -101,7 +101,7 @@ Licence: other-BSD
     shared with many OS's install programs.
 
 Files: debian/*
-Copyright:  2010-2013,2014 Thomas E. Dickey
+Copyright:  2010-2014,2015 Thomas E. Dickey
 Licence: other-BSD
     Permission to use, copy, modify, and distribute this software and its
     documentation for any purpose and without fee is hereby granted,
diff --git a/PACKAGE/lynx.iss b/PACKAGE/lynx.iss
index 77901cf2..fab2b4fb 100644
--- a/PACKAGE/lynx.iss
+++ b/PACKAGE/lynx.iss
@@ -1,4 +1,4 @@
-; $LynxId: lynx.iss,v 1.13 2014/12/22 00:44:43 tom Exp $

+; $LynxId: lynx.iss,v 1.14 2015/01/02 12:27:21 tom Exp $

 ; vile:ts=2 sw=2 notabinsert

 ;

 ; This is the BASE script for different flavors of the installer for Lynx.

@@ -90,7 +90,7 @@ AppName={#MyAppName}
 #emit 'VersionInfoVersion=' + LYNX_TARGET1

 AppVerName={#MyAppVerName}

 AppPublisher={#MyAppPublisher}

-AppCopyright=© 1997-2013,2014, Thomas E. Dickey

+AppCopyright=© 1997-2014,2015, Thomas E. Dickey

 AppPublisherURL={#MyAppURL}

 AppSupportURL={#MyAppURL}

 AppUpdatesURL={#MyAppURL}

diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi
index a175acca..eaad131f 100644
--- a/PACKAGE/lynx.nsi
+++ b/PACKAGE/lynx.nsi
@@ -1,4 +1,4 @@
-; $LynxId: lynx.nsi,v 1.19 2014/03/16 15:03:40 tom Exp $

+; $LynxId: lynx.nsi,v 1.21 2015/01/02 12:27: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 "1002"

-!define VERSION_PATCH "dev.2"

+!define VERSION_LEVEL "1003"

+!define VERSION_PATCH "dev.3"

 

 !define SUBKEY "Lynx"

 

@@ -28,7 +28,7 @@ SetCompressor /SOLID lzma
 

 VIAddVersionKey ProductName "${SUBKEY}"

 VIAddVersionKey CompanyName "http://lynx.isc.org"

-VIAddVersionKey LegalCopyright "© 1997-2013,2014, Thomas E. Dickey"

+VIAddVersionKey LegalCopyright "© 1997-2014,2015, Thomas E. Dickey"

 VIAddVersionKey FileDescription "Lynx Installer (MinGW)"

 VIAddVersionKey FileVersion "${VERSION}"

 VIAddVersionKey ProductVersion "${VERSION}"

diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index 387eccf4..3c44ca71 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,8 +1,8 @@
-# $LynxId: lynx.spec,v 1.27 2014/03/16 15:03:40 tom Exp $
+# $LynxId: lynx.spec,v 1.28 2014/12/30 21:37:40 tom Exp $
 Summary: A text-based Web browser
 Name: lynx
 Version: 2.8.9
-Release: dev.2
+Release: dev.3
 License: GPLv2
 Group: Applications/Internet
 Source: lynx%{version}%{release}.tgz
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index 6201662a..460a3558 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.2"
+#define LYNX_VERSION "2.8.9dev.3"
 

 ; most-recent full release and target

 #define LYNX_RELEASE "2.8.9"

diff --git a/configure.in b/configure.in
index f8b409bf..1e30b9db 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.269 2014/03/16 15:03:40 tom Exp $
+dnl $LynxId: configure.in,v 1.270 2014/12/30 21:37:40 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.2)
+AC_REVISION(2.8.9dev.3)
 
 # 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.2
+VERSION=2.8.9dev.3
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
diff --git a/lynx.cfg b/lynx.cfg
index d4e9dd75..6b2571ca 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,10 +1,10 @@
-# $LynxId: lynx.cfg,v 1.250 2014/12/22 01:39:40 tom Exp $
+# $LynxId: lynx.cfg,v 1.251 2014/12/30 21:37:40 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.2"
+#PRCS LYNX_VERSION "2.8.9dev.3"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
 #PRCS LYNX_DATE "Sun, 21 Dec 2014 17:39:40 -0800"
diff --git a/makefile.in b/makefile.in
index 23eb6863..30b6bc80 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.147 2014/03/16 15:03:40 tom Exp $
+# $LynxId: makefile.in,v 1.148 2014/12/30 21:37:40 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.2
+LYNX_VERSION	= 2.8.9dev.3
 
 ## 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 ee6861ae..0bb08580 100644
--- a/src/LYIcon.rc
+++ b/src/LYIcon.rc
@@ -1,12 +1,12 @@
-// $LynxId: LYIcon.rc,v 1.13 2014/03/16 15:03:40 tom Exp $
+// $LynxId: LYIcon.rc,v 1.15 2015/01/02 12:27:53 tom Exp $
 
 #include <windows.h>
 
 100	ICON	"../samples/lynx.ico"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    2,8,9,1002
-PRODUCTVERSION 2,8,9,1002
+FILEVERSION    2,8,9,1003
+PRODUCTVERSION 2,8,9,1003
 FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
 FILEFLAGS      0
 FILEOS         VOS_NT_WINDOWS32
@@ -19,12 +19,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName",      "http://lynx.isc.org"
       VALUE "FileDescription",  "Lynx - web browser"
-      VALUE "FileVersion",      "2.8.9.1002"
+      VALUE "FileVersion",      "2.8.9.1003"
       VALUE "InternalName",     "Lynx"
-      VALUE "LegalCopyright",   "©1997-2014 Thomas E. Dickey"
+      VALUE "LegalCopyright",   "©1997-2015 Thomas E. Dickey"
       VALUE "OriginalFilename", "lynx.exe"
       VALUE "ProductName",      "Lynx - web browser"
-      VALUE "ProductVersion",   "2.8.9.1002"
+      VALUE "ProductVersion",   "2.8.9.1003"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/src/LYMail.c b/src/LYMail.c
index 846e62a2..218e4d3a 100644
--- a/src/LYMail.c
+++ b/src/LYMail.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMail.c,v 1.96 2013/11/28 11:23:37 tom Exp $
+ * $LynxId: LYMail.c,v 1.97 2014/12/30 22:16:41 Gisle.Vanem Exp $
  */
 #include <HTUtils.h>
 #include <HTParse.h>
@@ -534,7 +534,6 @@ int LYSendMailFile(char *the_address,
 #endif
 #ifdef __DJGPP__
     if (LYGetEnv("SHELL")) {
-	extern int dj_is_bash;
 	extern char *shell;
 	const char *c_option;
 	const char *format = "%s %s %s -t %s -F %s";
diff --git a/src/LYUtils.c b/src/LYUtils.c
index ea4e7231..c99c51df 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYUtils.c,v 1.272 2014/12/22 00:22:55 tom Exp $
+ * $LynxId: LYUtils.c,v 1.273 2014/12/30 22:16:41 Gisle.Vanem Exp $
  */
 #include <HTUtils.h>
 #include <HTTCP.h>
@@ -5183,7 +5183,7 @@ static char *HomeEnv(void)
 {
     char *result = CheckDir(LYGetEnv("HOME"));
 
-#if defined (USE_DOS_DRIVES)
+#if defined (USE_DOS_DRIVES) && defined(_WIN32)
     if (result == 0) {
 	char *head;
 	char *leaf;
diff --git a/userdefs.h b/userdefs.h
index 3650eb45..3c279e4f 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,12 +1,12 @@
 /*
- * $LynxId: userdefs.h,v 1.298 2014/12/22 01:39:40 tom Exp $
+ * $LynxId: userdefs.h,v 1.300 2015/01/02 12:27:07 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
  *   (c) Copyright 1992, 1993, 1994 University of Kansas
  *	 1995, 1996: GNU General Public License
  *
- *   Copyright 1996-2013,2014 Thomas E. Dickey and Lynx Developers Group
+ *   Copyright 1996-2014,2015 Thomas E. Dickey and Lynx Developers Group
  *   Note: GNU General Public License is not a copyright.
  */
 
@@ -1442,7 +1442,7 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.9dev.2"
+#define LYNX_VERSION "2.8.9dev.3"
 #define LYNX_WWW_HOME "http://lynx.isc.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */