Commit 43babf72 authored by Axel Beckert's avatar Axel Beckert

Imported Upstream version 2.8.8pre2

parent 9180976b
-- $LynxId: CHANGES,v 1.701 2013/11/29 01:16:04 tom Exp $
-- $LynxId: CHANGES,v 1.713 2013/12/17 23:20:50 tom Exp $
===============================================================================
Changes since Lynx 2.8 release
===============================================================================
2013-12-17 (2.8.8pre.2)
* change makefile.msc and lynx-slang.iss to use dll for slang -TD
* change URL for HELPFILE in lynx.cfg, etc., to omit version-specifics -TD
* update example of options menu shown in user-guide -TD
* restore ^Z maxscreen-toggle for Windows, omitted in 2.8.8dev.17 cleanup -TD
* typographical fixes for manpage (Bjarni I. Gislason, Debian #732236).
* allow fallback sleep() function to be used for MinGW -GV
* remove special case in configure.in which added "-lcompat" to $LIBS
for OpenBSD, MirBSD and EkkoBSD (Christian Weisgerber, Thorsten Glaser).
* build-fix for --disable-forms-options -TD
* omit request for admin-access in NullSoft installer, since lynx could be
installed in user's directory -TD
* change Windows default for LYNX_LSS_FILE to not use a directory-path -TD
2013-11-28 (2.8.8pre.1)
2013-11-28 (2.8.8dev.17)
* revise/update counts in README.metrics, using a script replacing a manual
......
lynx-dev (2.8.8dev.17) unstable; urgency=low
lynx-dev (2.8.8pre.2) unstable; urgency=low
* changes for dev.17
* maintenance updates
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 29 Sep 2013 19:33:16 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 30 Nov 2013 20:12:55 -0500
lynx-dev (2.8.8dev.16) unstable; urgency=high
......
; $LynxId: lynx-slang.iss,v 1.1 2008/12/29 13:28:38 tom Exp $
; $LynxId: lynx-slang.iss,v 1.2 2013/12/17 23:04:59 tom Exp $
;
; This is an installer for the "color-style" flavor of Lynx.
;
......@@ -7,6 +7,6 @@
#define SetupBaseName "lynx-sl"
#define SourceExeName "lynx-slang.exe"
#define NoScreenDll
#define ScreenDllName "wslang32.dll"
#include "lynx.iss"
; $LynxId: lynx.nsi,v 1.9 2013/10/17 00:52:26 tom Exp $
; $LynxId: lynx.nsi,v 1.11 2013/12/01 01:31: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 "8"
!define VERSION_LEVEL "1017"
!define VERSION_PATCH "dev.17"
!define VERSION_LEVEL "2002"
!define VERSION_PATCH "pre.2"
!define SUBKEY "Lynx"
......@@ -23,8 +23,6 @@ InstallDir "$PROGRAMFILES\${INSTALL}"
InstallDirRegKey HKLM "Software\${SUBKEY}" "$INSTDIR\bin"
OutFile "NSIS-Output\${APPNAME}-${VERSION}-setup.exe"
RequestExecutionLevel highest
CRCCheck on
SetCompressor /SOLID lzma
......
# $LynxId: lynx.spec,v 1.19 2013/10/24 00:21:20 tom Exp $
# $LynxId: lynx.spec,v 1.20 2013/12/01 01:12:55 tom Exp $
Summary: A text-based Web browser
Name: lynx
Version: 2.8.8
Release: dev.17
Release: pre.2
License: GPLv2
Group: Applications/Internet
Source: lynx%{version}%{release}.tgz
......
; version used for Inno Setup files.
; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$
#define LYNX_VERSION "2.8.8pre.1"
#define LYNX_VERSION "2.8.8pre.2"
; most-recent full release and target
#define LYNX_RELEASE "2.8.7"
......
/*
* $LynxId: HTTCP.c,v 1.128 2013/11/28 11:14:59 tom Exp $
* $LynxId: HTTCP.c,v 1.129 2013/12/07 15:36:55 tom Exp $
*
* Generic Communication Code HTTCP.c
* ==========================
......@@ -1486,12 +1486,12 @@ static size_t fill_addrinfo(void **buffer,
* packed, uninitialized gaps make it hard to analyse with valgrind.
*/
/* *INDENT-EQLS* */
actual->ai_flags = phost->ai_flags;
actual->ai_family = phost->ai_family;
actual->ai_flags = phost->ai_flags;
actual->ai_family = phost->ai_family;
actual->ai_socktype = phost->ai_socktype;
actual->ai_protocol = phost->ai_protocol;
actual->ai_addrlen = phost->ai_addrlen;
actual->ai_addr = (struct sockaddr *) (void *) heap;
actual->ai_addrlen = phost->ai_addrlen;
actual->ai_addr = (struct sockaddr *) (void *) heap;
MemCpy(heap, phost->ai_addr, phost->ai_addrlen);
heap += phost->ai_addrlen;
......
This diff is collapsed.
dnl $LynxId: configure.in,v 1.252 2013/10/23 22:31:51 tom Exp $
dnl $LynxId: configure.in,v 1.255 2013/12/02 22:56:08 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.8pre.1)
AC_REVISION(2.8.8pre.2)
# 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.8pre.1
VERSION=2.8.8pre.2
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
......@@ -291,9 +291,6 @@ msdosdjgpp*)
next*)
TRY_CFLAGS="$TRY_CFLAGS -DNEXT"
;;
openbsd* | ekkobsd* | mirbsd*)
LIBS="$LIBS -lcompat"
;;
osf4*)
# The -Olimit flag (see below) is no longer available with
# Digital C 5.2, which is bundled with Digital UNIX 4.0.
......
-- $LynxId: README.metrics,v 1.6 2013/11/28 20:01:44 tom Exp $
-- $LynxId: README.metrics,v 1.8 2013/12/16 00:14:10 tom Exp $
This is a short summary of code metrics showing how lynx has grown from
release to release. It also shows how the original codebase has
......@@ -23,8 +23,8 @@ Release Current Original
15573 13587 3.9 8.0
2.8.7 441453 180674 25064 23101 5.7 12.8
15436 13473 3.5 7.5
2.8.8dev.17 464771 184804 24028 22288 5.2 12.1
14604 12864 3.1 7.0
2.8.8pre.2 464871 184810 24027 22288 5.2 12.1
14603 12864 3.1 7.0
Beginning with 2.8.6, the percentage of the remaining original codebase is
shown on two lines (i.e., comparing against 2.4.2 indented to use the current
......@@ -66,7 +66,7 @@ start of the 2.8 series:
1 Chris Adams
1 Christian Hudon
1 Christian Jensen
2.5 Christian Weisgerber
3 Christian Weisgerber
1 Christoph J Gartmann
1 Chuck Houpt
1 Crouton
......@@ -90,7 +90,7 @@ start of the 2.8 series:
1 Frederick P Herrmann
1 Georg Drenkhahn
1 George Lindholm
21 Gisle Vanem
22 Gisle Vanem
1 Glenn Nielsen
1 Hans Wurst
26.5 Hataguchi Takeshi
......@@ -174,10 +174,10 @@ start of the 2.8 series:
1 Tadayoshi Okuma
1 Takao Fujiwara
1 Thomas Braun
2027.3 Thomas E Dickey
2030.3 Thomas E Dickey
0.5 Thomas Klausner
1 Thomas Viehmann
16.5 Thorsten Glaser
17 Thorsten Glaser
1 Tim Chase
4 Tim Larson
1 Timur Birsh
......@@ -190,7 +190,7 @@ start of the 2.8 series:
1 Wesley Morgan
1 Zdenek Prikryl
1.5 nsh@horae.dti.ne.jp
4349 Total
4355 Total
-------------------------------------------------------------------------------
......
/*
* $LynxId: dirent.c,v 1.5 2012/02/10 11:35:49 tom Exp $
* $LynxId: dirent.c,v 1.6 2013/12/07 13:46:58 tom Exp $
*
* dir.c for MS-DOS by Samuel Lam <skl@van-bc.UUCP>, June/87
*/
......@@ -28,13 +28,13 @@
#endif
#ifndef __GNUC__
#pragma warning (disable : 4100) /* unreferenced formal parameter */
#pragma warning (disable : 4127) /* conditional expression is constant */
#pragma warning (disable : 4201) /* nameless struct/union */
#pragma warning (disable : 4214) /* bit field types other than int */
#pragma warning (disable : 4310) /* cast truncates constant value */
#pragma warning (disable : 4514) /* unreferenced inline function has been removed */
#pragma warning (disable : 4996) /* This function or variable may be unsafe. ... */
#pragma warning (disable : 4100) /* unreferenced formal parameter */
#pragma warning (disable : 4127) /* conditional expression is constant */
#pragma warning (disable : 4201) /* nameless struct/union */
#pragma warning (disable : 4214) /* bit field types other than int */
#pragma warning (disable : 4310) /* cast truncates constant value */
#pragma warning (disable : 4514) /* unreferenced inline function has been removed */
#pragma warning (disable : 4996) /* This function or variable may be unsafe. ... */
#endif
#include <windows.h>
......
# $LynxId: lynx.cfg,v 1.229 2013/10/21 09:11:04 tom Exp $
# $LynxId: lynx.cfg,v 1.233 2013/12/17 00:44:11 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.8pre.1"
#PRCS LYNX_VERSION "2.8.8pre.2"
#
# $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
#PRCS LYNX_DATE "Thu, 28 Nov 2013 17:17:12 -0800"
#PRCS LYNX_DATE "Tue, 17 Dec 2013 17:56:13 -0800"
#
# Definition pairs are of the form VARIABLE:DEFINITION
# NO spaces are allowed between the pair items.
......@@ -23,7 +23,7 @@
# An HTML'ized description of all settings (based on comments in this file,
# with alphabetical table of settings and with table of settings by category)
# is available at http://lynx.isc.org/release/lynx2-8-7/lynx_help/cattoc.html
# is available at http://lynx.isc.org/release/breakout/lynx_help/cattoc.html
#
### The conversion is done via the scripts/cfg2html.pl script.
### Several directives beginning with '.' are used for this purpose.
......@@ -109,12 +109,12 @@ STARTFILE:http://lynx.isc.org/
# for this distribution (use SHELL syntax including the device
# on VMS systems).
# The default HELPFILE is:
.url http://lynx.isc.org/release/lynx2-8-7/lynx_help/lynx_help_main.html
.url http://lynx.isc.org/release/breakout/lynx_help/lynx_help_main.html
# This should be changed to the local path.
# This definition will be overridden if the "LYNX_HELPFILE" environment
# variable has been set.
#
HELPFILE:http://lynx.isc.org/release/lynx2-8-7/lynx_help/lynx_help_main.html
HELPFILE:http://lynx.isc.org/release/breakout/lynx_help/lynx_help_main.html
.ex
#HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html
......
.\" $LynxId: lynx.man,v 1.108 2013/10/23 22:49:39 tom Exp $
.\" $LynxId: lynx.man,v 1.109 2013/12/15 23:20:40 Bjarni.I.Gislason Exp $
.\" **************************************************************************
.\" Escape single quotes in literal strings from groff's Unicode transform.
.ie \n(.g .ds AQ \(aq
......@@ -210,7 +210,7 @@ and hexadecimal values represent other 8-bit codes.
.TP
.B set
followed by a \*(``name=value\*('' allows one to override values set in the
lynx.cfg or .lynxrc files.
lynx.cfg or \&.lynxrc files.
\fILynx\fP tries the cfg-file setting first.
.RE
.TP
......@@ -225,10 +225,10 @@ it is equivalent to setting the \fBCOLORTERM\fR environment variable.
library like \fBncurses\fR, \fILynx\fP relies completely on the terminal
description to determine whether color mode is possible, and
this flag is not needed and thus unavailable.)
A saved show_color=always setting found in a .lynxrc file at
A saved show_color=always setting found in a \&.lynxrc file at
startup has the same effect.
A saved show_color=never found
in .lynxrc on startup is overridden by this flag.
in \&.lynxrc on startup is overridden by this flag.
.TP
.B \-connect_timeout\fR=\fIN
Sets the connection timeout, where N is given in seconds.
......@@ -241,7 +241,7 @@ for most systems, but ~/cookies for MS-DOS.
.B \-cookie_save_file\fR=\fIFILENAME
specifies a file to use to store cookies.
If none is specified, the value given by
\fB-cookie_file\fR is used.
\fB\-cookie_file\fR is used.
.TP
.B \-cookies
toggles handling of Set-Cookie headers.
......@@ -467,7 +467,7 @@ within a mailto URL or form ACTION.
.TP
.B \-nocolor
force color mode off, overriding terminal capabilities and any
-color flags, COLORTERM variable, and saved .lynxrc settings.
\-color flags, COLORTERM variable, and saved \&.lynxrc settings.
.TP
.B \-noexec
disable local program execution.
......@@ -690,7 +690,7 @@ disallow mail.
disallow USENET News posting.
.TP
.B options_save
disallow saving options in .lynxrc.
disallow saving options in \&.lynxrc.
.TP
.B outside_ftp
disallow ftps for people coming from outside your
......@@ -742,7 +742,7 @@ toggles showing scrollbar.
toggles showing arrows at ends of the scrollbar.
.TP
.B \-selective
require .www_browsable files to browse directories.
require \&.www_browsable files to browse directories.
.TP
.B \-session\fR=\fIFILENAME
resumes from specified file on startup and saves session to that file on exit.
......@@ -860,7 +860,7 @@ color-style
TRST (table layout)
.TP
.B 8
configuration (lynx.cfg, .lynxrc, .lynx-keymaps, mime.types and mailcap contents)
configuration (lynx.cfg, \&.lynxrc, \&.lynx-keymaps, mime.types and mailcap contents)
.TP
.B 16
binary string copy/append, used in form data construction.
......@@ -1297,6 +1297,6 @@ Worcester Foundation for Biomedical Research
.br
Shrewsbury, Massachusetts 01545
.PP
Thomas E. Dickey
Thomas E.\& Dickey
.br
<dickey@invisible-island.net>
<!-- $LynxId: Lynx_users_guide.html,v 1.118 2013/05/22 00:56:39 tom Exp $ -->
<!-- $LynxId: Lynx_users_guide.html,v 1.121 2013/12/17 00:47:51 tom Exp $ -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html>
......@@ -681,80 +681,81 @@
generated at runtime, in which the user fills in choices as in
any ordinary HTML form.</p>
<pre>
Options Menu (Lynx Version 2.8.7rel.1)
Options Menu (Lynx Version 2.8.8pre.2)
Accept Changes - Reset Changes Left Arrow cancels changes <a href="keystrokes/option_help.html">HELP!</a>
Accept Changes - Reset Changes - Left Arrow cancels changes - HELP!
Save options to disk: [_]
Save options to disk: [ ]
(options marked with (!) will not be saved)
General Preferences
User mode : [Advanced....]
Editor : __________________________________________
User mode : [Advanced____]
Editor : vile______________________________________
Type of Search : [Case insensitive]
Security and Privacy
Cookies (!) : [ask user..]
Cookies : [ask user__]
Invalid-Cookie Prompting (!) : [prompt normally___]
SSL Prompting (!) : [prompt normally___]
Keyboard Input
Keypad mode : [Links are numbered................]
Keypad mode : [Numbers act as arrows_____________]
Emacs keys : [OFF]
VI keys : [OFF]
Line edit style : [Bash-like Bindings]
Keyboard layout : [YAWERTY Cyrillic, for DEC LK201 kbd]
Display and Character Sets
Use locale-based character set(!): [OFF]
Display and Character Set
Use locale-based character set : [ON_]
Use HTML5 charset replacements(!): [OFF]
Display character set : [Cyrillic (ISO-8859-5)..........]
Assumed document character set(!): [iso-8859-1......]
Raw 8-bit (!) : [OFF]
X Display (!) : __________________________________________
Display character set : [UNICODE (UTF-8)________________]
Assumed document character set(!): [iso-8859-1______]
Raw 8-bit : [OFF]
X Display : localhost:0.0_____________________________
Document Appearance
Show color : [ON....]
Show color : [ON____]
Color style (!) : [lynx.lss___________]
Default colors (!) : [ON_]
Show cursor : [OFF]
Underline links (!) : [OFF]
Show scrollbar : [OFF]
Popups for select fields : [ON.]
HTML error recovery (!) : [strict (SortaSGML mode)]
Show scrollbar : [ON_]
Popups for select fields : [ON_]
HTML error recovery : [strict (SortaSGML mode)]
Bad HTML messages (!) : [Warn, point to trace-file]
Show images (!) : [as labels]
Verbose images : [OFF..........]
Show images : [ignore___]
Verbose images : [OFF__________]
Headers Transferred to Remote Servers
Personal mail address : __________________________________________
Personal mail name : __________________________________________
Personal name for mail : __________________________________________
Password for anonymous ftp : __________________________________________
Preferred media type (!) : [Accept lynx's internal types]
Preferred encoding (!) : [All_____]
Preferred document character set : _________________________________
Preferred document language : _________________________________
Send User-Agent header (!) : [ ]
User-Agent header (!) : __________________________________________
Preferred document language : en_______________________________
Send User-Agent header (!) : [X]
User-Agent header (!) : Lynx/2.8.8pre.2 libwww-FM/2.14 SSL-MM/1.4.
Listing and Accessing Files
Use Passive FTP (!) : [ON_]
FTP sort criteria : [By Name]
Local directory sort criteria : [Mixed style......]
Local directory sort order : [By name..........]
Show dot files : [ON.]
Execution links : [FOR LOCAL FILES ONLY]
FTP sort criteria : [By Date]
Local directory sort criteria : [Directories first]
Local directory sort order : [By Date_]
Show dot files : [OFF]
Pause when showing message (!) : [ON_]
Show transfer rate : [Show progressbar___]
Show transfer rate : [Show KiB/sec (2-digits), ETA__]
Special Files and Screens
Multi-bookmarks : [ADVANCED]
Review/edit Bookmarks files : Goto multi-bookmark menu
Auto Session (!) : [OFF]
Session file (!) : ___________________________________________
Visited Pages : [As Visit Tree..........]
Session file (!) : __________________________________________
Visited Pages : [By Last Visit Reversed_]
View the file lynx.cfg
View the file lynx.cfg.
Accept Changes - Reset Changes Left Arrow cancels changes
Accept Changes - Reset Changes - Left Arrow cancels changes
</pre>
......@@ -763,7 +764,7 @@
accessed by setting FORMS_OPTIONS to TRUE in <a href=
"#lynx.cfg">lynx.cfg</a>.</p>
<pre>
Options Menu (Lynx Version 2.8.7rel.1)
Options Menu (Lynx Version 2.8.8pre.2)
(E)ditor : emacs
(D)ISPLAY variable : aixtest.cc.ukans.edu:0.0
......@@ -4292,9 +4293,9 @@ the other two cannot be saved between sessions.
comments for hundreds of options, most of them commented out
because they are built-in defaults. You may visit an index of
options: <a href=
"http://lynx.isc.org/release/lynx2-8-7/lynx_help/cattoc.html">by
"http://lynx.isc.org/release/breakout/lynx_help/cattoc.html">by
category</a> or <a href=
"http://lynx.isc.org/release/lynx2-8-7/lynx_help/alphatoc.html">by
"http://lynx.isc.org/release/breakout/lynx_help/alphatoc.html">by
alphabet</a>.</p>
<p>To view your current configuration derived from lynx.cfg and
......
<!-- $LynxId: lynx_help_main.html,v 1.46 2013/10/20 18:42:32 tom Exp $ -->
<!-- $LynxId: lynx_help_main.html,v 1.47 2013/12/17 00:45:35 tom Exp $ -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html>
......@@ -39,11 +39,11 @@
<ul>
<li><a href=
"http://lynx.isc.org/release/lynx2-8-7/lynx_help/cattoc.html">lynx.cfg
"http://lynx.isc.org/release/breakout/lynx_help/cattoc.html">lynx.cfg
options</a> &mdash; a reference for advanced
configurations</li>
<li><a href="http://lynx.isc.org/release/lynx2-8-7/docs/">lynx
<li><a href="http://lynx.isc.org/release/breakout/docs/">lynx
documentation</a> &mdash; supplementary documentation</li>
<li><a href=
......
# $LynxId: makefile.in,v 1.132 2013/10/16 10:45:19 tom Exp $
# $LynxId: makefile.in,v 1.135 2013/12/17 00:45:35 tom Exp $
##makefile for lynx
SHELL = @CONFIG_SHELL@
......@@ -38,7 +38,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.8pre.1
LYNX_VERSION = 2.8.8pre.2
## 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.
......@@ -350,7 +350,7 @@ install-doc : $(DOCDIR) $(HELPDIR)
# So we limit sed delimiters to '!' and '%', depending on the expected text.
FIX_SED = tr '=' '"'
LYNX_URL='http://lynx.isc.org/release/lynx2-8-7'
LYNX_URL='http://lynx.isc.org/release/breakout'
LYNXDOCS_URL='$(LYNX_URL)/docs/'
LYNXHELP_URL='$(LYNX_URL)/lynx_help/'
......
# $LynxId: makefile.msc,v 1.28 2012/07/12 09:16:02 tom Exp $
# $LynxId: makefile.msc,v 1.29 2013/12/17 23:01:31 tom Exp $
#
# Makefile for `Lynx' browser for Microsoft Visual C++ 4.2 or later
#
......@@ -56,7 +56,7 @@ SSL_LIBS = "$(SSL_DIR)\lib\ssleay32.lib" "$(SSL_DIR)\lib\libeay32.lib"
SCREEN_DEFS = /D "PDCURSES" /D "COLOR_CURSES" /D "FANCY_CURSES" /D "WIDE_CURSES"
SCREEN_LIB = pdcurses
!else
SCREEN_DEFS = /D "USE_SLANG"
SCREEN_DEFS = /D "USE_SLANG" /D "SLANG_DLL"
SCREEN_LIB = wslang32
!endif
......
/* $LynxId: LYForms.c,v 1.110 2013/10/13 18:39:48 tom Exp $ */
/* $LynxId: LYForms.c,v 1.111 2013/12/07 13:46:58 tom Exp $ */
#include <HTUtils.h>
#include <HTCJK.h>
#include <HTTP.h>
......@@ -23,7 +23,7 @@
#if defined(VMS) && !defined(USE_SLANG)
#define RepaintKey() 12 /* CTRL-L for repaint */
#else
#define RepaintKey() ((!enable_scrollback) ? 23 : 12) /* CTRL-W or CTRL-L */
#define RepaintKey() ((!enable_scrollback) ? 23 : 12) /* CTRL-W or CTRL-L */
#endif /* VMS && !USE_SLANG */
static int form_getstr(int cur,
......
// $LynxId: LYIcon.rc,v 1.4 2013/10/14 23:34:13 tom Exp $
// $LynxId: LYIcon.rc,v 1.5 2013/12/01 01:12:55 tom Exp $
#include <windows.h>
100 ICON "../samples/lynx.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,8,8,1017
PRODUCTVERSION 2,8,8,1017
FILEVERSION 2,8,8,2002
PRODUCTVERSION 2,8,8,2002
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.8.1017"
VALUE "FileVersion", "2.8.8.2002"
VALUE "InternalName", "Lynx"
VALUE "LegalCopyright", "1997-2013 Thomas E. Dickey"
VALUE "OriginalFilename", "lynx.exe"
VALUE "ProductName", "Lynx - web browser"
VALUE "ProductVersion", "2.8.8.1017"
VALUE "ProductVersion", "2.8.8.2002"
END
END
BLOCK "VarFileInfo"
......
/* $LynxId: LYKeymap.c,v 1.109 2013/11/28 11:19:31 tom Exp $ */
/* $LynxId: LYKeymap.c,v 1.110 2013/12/17 00:27:55 tom Exp $ */
#include <HTUtils.h>
#include <LYUtils.h>
#include <LYGlobalDefs.h>
......@@ -80,6 +80,7 @@ static const LYEditInit initKeymapData[] =
{23, LYK_SWITCH_DTD}, /* ^W */
{24, LYK_REFRESH}, /* ^X */
{25, LYK_CACHE_JAR}, /* ^Y */
{27, LYK_MAXSCREEN_TOGGLE}, /* ^Z */
{33, LYK_NEXT_PAGE}, /* */
{34, LYK_SHELL}, /* ! */
{35, LYK_SOFT_DQUOTES}, /* " */
......
/*
* $LynxId: LYLeaks.c,v 1.36 2012/02/10 00:33:39 tom Exp $
* $LynxId: LYLeaks.c,v 1.37 2013/12/07 13:46:58 tom Exp $
*
* Copyright (c) 1994, University of Kansas, All Rights Reserved
* (this file was rewritten twice - 1998/1999 and 2003/2004)
......@@ -912,7 +912,7 @@ void LYLeakSABCat(bstring **dest,
t->str = (char *) LYLeakRealloc(t->str, length, cp_File, ssi_Line);
} else {
if ((t = (bstring *) LYLeakCalloc(1, sizeof(bstring), cp_File,
ssi_Line)) == NULL)
ssi_Line)) == NULL)
outofmem(__FILE__, "HTSACat");
assert(t != NULL);
......
/*
* $LynxId: LYStyle.c,v 1.94 2013/11/28 11:37:02 tom Exp $
* $LynxId: LYStyle.c,v 1.95 2013/12/01 19:22:44 tom Exp $
*
* character level styles for Lynx
* (c) 1996 Rob Partington -- donated to the Lyncei (if they want it :-)
......@@ -941,7 +941,9 @@ void init_color_styles(char **from_cmdline, const char *default_styles)
*/
style_readFromFile(lynx_lss_file);
add_to_lss_list(LYPathLeaf(lynx_lss_file), lynx_lss_file);
#ifndef NO_OPTION_FORMS
build_lss_enum(list_of_lss_files);
#endif
}
void reinit_color_styles(void)
......
/*
* $LynxId: LYUtils.c,v 1.262 2013/11/29 00:04:25 tom Exp $
* $LynxId: LYUtils.c,v 1.263 2013/12/09 11:21:42 tom Exp $
*/
#include <HTUtils.h>
#include <HTTCP.h>
......@@ -4583,7 +4583,7 @@ int win32_check_interrupt(void)
return FALSE;
}
#if !defined(__MINGW32__)
#if !defined(sleep)
void sleep(unsigned sec)
{
unsigned int i, j;
......
/*
* $LynxId: userdefs.h,v 1.278 2013/10/23 22:26:08 tom Exp $
* $LynxId: userdefs.h,v 1.282 2013/12/17 00:45:35 tom Exp $
*
* Lynx - Hypertext navigation system
*
......@@ -457,7 +457,11 @@
* -lss command line switch will override these definitions.
*/
#ifndef LYNX_LSS_FILE
#ifdef DOSPATH
#define LYNX_LSS_FILE "lynx.lss"
#else
#define LYNX_LSS_FILE "/usr/local/lib/lynx.lss"
#endif
#endif /* LYNX_LSS_FILE */
#endif /* VMS OR UNIX */
......@@ -498,12 +502,12 @@
* for this distribution (use SHELL syntax including the device
* on VMS systems).
* The default HELPFILE is:
* http://lynx.isc.org/release/lynx2-8-7/lynx_help/lynx_help_main.html
* http://lynx.isc.org/release/breakout/lynx_help/lynx_help_main.html
* This should be changed here or in lynx.cfg to the local path.
* The definition here can be overridden at run time by defining a
* "LYNX_HELPFILE" environment variable.
*/
#define HELPFILE "http://lynx.isc.org/release/lynx2-8-7/lynx_help/lynx_help_main.html"
#define HELPFILE "http://lynx.isc.org/release/breakout/lynx_help/lynx_help_main.html"
/* #define HELPFILE "file://localhost/PATH_TO/lynx_help/lynx_help_main.html" */
/*****************************
......@@ -1438,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.8pre.1"
#define LYNX_VERSION "2.8.8pre.2"
#define LYNX_WWW_HOME "http://lynx.isc.org/"
#define LYNX_WWW_DIST "http://lynx.isc.org/current/"
/* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
#define LYNX_DATE "Thu, 28 Nov 2013 17:17:12 -0800"
#define LYNX_DATE "Tue, 17 Dec 2013 17:56:13 -0800"
#define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */
#define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment