diff options
| -rw-r--r-- | CHANGES | 8 | ||||
| -rw-r--r-- | PACKAGE/lynx-slang.iss | 4 | ||||
| -rw-r--r-- | lynx.cfg | 10 | ||||
| -rw-r--r-- | lynx_help/Lynx_users_guide.html | 77 | ||||
| -rw-r--r-- | lynx_help/lynx_help_main.html | 6 | ||||
| -rw-r--r-- | makefile.in | 4 | ||||
| -rw-r--r-- | makefile.msc | 4 | ||||
| -rw-r--r-- | src/LYKeymap.c | 3 | ||||
| -rw-r--r-- | userdefs.h | 8 |
9 files changed, 65 insertions, 59 deletions
diff --git a/CHANGES b/CHANGES index 317899a3..c15f7757 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,13 @@ --- $LynxId: CHANGES,v 1.709 2013/12/16 00:12:22 tom Exp $ +-- $LynxId: CHANGES,v 1.713 2013/12/17 23:20:50 tom Exp $ =============================================================================== Changes since Lynx 2.8 release =============================================================================== -2013-12-15 (2.8.8pre.2) +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 diff --git a/PACKAGE/lynx-slang.iss b/PACKAGE/lynx-slang.iss index 9f42316e..46c5fd6e 100644 --- a/PACKAGE/lynx-slang.iss +++ b/PACKAGE/lynx-slang.iss @@ -1,4 +1,4 @@ -; $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" diff --git a/lynx.cfg b/lynx.cfg index 1e9112a0..e065f74e 100644 --- a/lynx.cfg +++ b/lynx.cfg @@ -1,4 +1,4 @@ -# $LynxId: lynx.cfg,v 1.232 2013/12/01 01:12:55 tom Exp $ +# $LynxId: lynx.cfg,v 1.234 2013/12/18 01:56:13 tom Exp $ # lynx.cfg file. # The default placement for this file is /usr/local/lib/lynx.cfg (Unix) # or Lynx_Dir:lynx.cfg (VMS) @@ -7,7 +7,7 @@ #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 diff --git a/lynx_help/Lynx_users_guide.html b/lynx_help/Lynx_users_guide.html index b703bfaa..2b5eca61 100644 --- a/lynx_help/Lynx_users_guide.html +++ b/lynx_help/Lynx_users_guide.html @@ -1,4 +1,4 @@ -<!-- $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 diff --git a/lynx_help/lynx_help_main.html b/lynx_help/lynx_help_main.html index 1a1f5df7..d338a251 100644 --- a/lynx_help/lynx_help_main.html +++ b/lynx_help/lynx_help_main.html @@ -1,4 +1,4 @@ -<!-- $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> — 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> — supplementary documentation</li> <li><a href= diff --git a/makefile.in b/makefile.in index c9519b8a..08ff3a09 100644 --- a/makefile.in +++ b/makefile.in @@ -1,4 +1,4 @@ -# $LynxId: makefile.in,v 1.134 2013/12/01 01:12:55 tom Exp $ +# $LynxId: makefile.in,v 1.135 2013/12/17 00:45:35 tom Exp $ ##makefile for lynx SHELL = @CONFIG_SHELL@ @@ -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/' diff --git a/makefile.msc b/makefile.msc index f2da6d42..b256396a 100644 --- a/makefile.msc +++ b/makefile.msc @@ -1,4 +1,4 @@ -# $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 diff --git a/src/LYKeymap.c b/src/LYKeymap.c index 73f6c0a0..20d7f101 100644 --- a/src/LYKeymap.c +++ b/src/LYKeymap.c @@ -1,4 +1,4 @@ -/* $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}, /* " */ diff --git a/userdefs.h b/userdefs.h index 254188c1..5a637b4e 100644 --- a/userdefs.h +++ b/userdefs.h @@ -1,5 +1,5 @@ /* - * $LynxId: userdefs.h,v 1.281 2013/12/01 01:12:55 tom Exp $ + * $LynxId: userdefs.h,v 1.283 2013/12/18 01:56:13 tom Exp $ * * Lynx - Hypertext navigation system * @@ -502,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" */ /***************************** @@ -1446,7 +1446,7 @@ #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 */ |