diff options
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | WWW/Library/Implementation/makefile.in | 4 | ||||
| -rw-r--r-- | lynx.cfg | 26 | ||||
| -rw-r--r-- | src/chrtrans/makefile.in | 4 |
4 files changed, 26 insertions, 13 deletions
diff --git a/CHANGES b/CHANGES index b33be350..ad8382a4 100644 --- a/CHANGES +++ b/CHANGES @@ -1,10 +1,11 @@ --- $LynxId: CHANGES,v 1.907 2017/07/04 20:17:10 tom Exp $ +-- $LynxId: CHANGES,v 1.908 2017/07/04 22:48:35 tom Exp $ =============================================================================== Changes since Lynx 2.8 release =============================================================================== 2017-07-04 (2.8.9dev.15) -* amended the Backes' change to the COLLAPSE_BR_TAGS feature -TD +* add note in lynx.cfg about default values (Debian #408448) -TD +* amended Backes' change to the COLLAPSE_BR_TAGS feature for compatibility -TD + use ENABLE_LYNXRC to determine whether it is written to the .lynxrc file. + add command-line option, etc., for controlling whether blank lines are trimmed, e.g., trailing lines as well as the special case for collapsing diff --git a/WWW/Library/Implementation/makefile.in b/WWW/Library/Implementation/makefile.in index 50d3389e..e5a27547 100644 --- a/WWW/Library/Implementation/makefile.in +++ b/WWW/Library/Implementation/makefile.in @@ -1,4 +1,4 @@ -# $LynxId: makefile.in,v 1.32 2015/12/13 23:20:11 tom Exp $ +# $LynxId: makefile.in,v 1.33 2017/07/04 22:45:38 tom Exp $ # Make WWW under unix for a.n.other unix system (bsd) # Use this as a template @@ -170,7 +170,7 @@ lint: .c.i: @RULE_CC@ - @ECHO_CC@$(CPP) -C $(CPPOPTS) $(srcdir)/$*.c >$@ + @ECHO_CC@$(CPP) $(CPPOPTS) $(srcdir)/$*.c >$@ depend : makedepend -fmakefile -- $(CFLAGS) -- $(CFILES) diff --git a/lynx.cfg b/lynx.cfg index 5a19a7ea..5ac2042e 100644 --- a/lynx.cfg +++ b/lynx.cfg @@ -1,4 +1,4 @@ -# $LynxId: lynx.cfg,v 1.284 2017/07/04 19:53:20 tom Exp $ +# $LynxId: lynx.cfg,v 1.285 2017/07/04 22:57:01 tom Exp $ # lynx.cfg file. # The default placement for this file is /usr/local/lib/lynx.cfg (Unix) # or Lynx_Dir:lynx.cfg (VMS) @@ -9,8 +9,9 @@ # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$ #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. +# Definition pairs (configuration settings) are of the form +# VARIABLE:DEFINITION +# NO spaces are allowed around the colon ":" between the pair items. # # If you do not have write access to /usr/local/lib you may change # the default location of this file in the userdefs.h file and recompile, @@ -21,6 +22,17 @@ # (Any line beginning with punctuation is ignored). Leading blanks on each # line are ignored; trailing blanks may be significant depending on the option. +# In most cases, a definition can be overridden by another later in the +# file, or in an including configuration file. You can see the effect of +# definitions (and redefinitions) in the trace file Lynx.log by using the +# "-trace" and "-trace-mask" options, e.g., +# lynx -trace -trace-mask=8 + +# As a documentation aid, the default values for each setting are shown +# commented-out. By convention, these default value comments have no space +# after the "#", e.g., +# #HTTP_PROTOCOL:1.0 + # 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.invisible-island.net/release/breakout/lynx_help/cattoc.html @@ -958,7 +970,7 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/ # Local execution links and scripts are by default completely disabled, # unless a change is made to the userdefs.h file to enable them or # the configure script is used with the corresponding options -# (--enable-exec-links and --enable-exec-scripts). +# (-enable-exec-links and -enable-exec-scripts). # See the Lynx source code distribution and the userdefs.h # file for more detail on enabling execution links and scripts. # @@ -1235,7 +1247,7 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/ .h2 BIBP_BIBHOST # BIBP_BIBHOST is the URL at which local bibp service may be found, if # it exists. Defaults to http://bibhost/ for protocol conformance, but -# may be overridden here or via --bibhost parameter. +# may be overridden here or via -bibhost parameter. #BIBP_BIBHOST:http://bibhost/ .h1 Interaction @@ -2960,7 +2972,7 @@ MINIMAL_COMMENTS:TRUE # gray brightred brightgreen yellow # brightblue brightmagenta brightcyan white .fi -# or (if you have configured using --enable-default-colors with ncurses or +# or (if you have configured using -enable-default-colors with ncurses or # slang), "default" may be used for foreground and background. # # Note that in most cases a white background is really "lightgray", since @@ -3272,7 +3284,7 @@ COLOR:6:brightred:black # link that otherwise will have no label associated with it). Using an empty # string as the value will cause lynx to behave in the old way - hidden links # will be handled according to other settings (mostly the parameter of -# --hiddenlinks command-line switch). If the value is non-empty string, hidden +# -hiddenlinks command-line switch). If the value is non-empty string, hidden # link becomes non-hidden so it won't be handled as hidden link, e.g., listed # among hidden links on 'l'isting page. # diff --git a/src/chrtrans/makefile.in b/src/chrtrans/makefile.in index 5978a86d..aab358fe 100644 --- a/src/chrtrans/makefile.in +++ b/src/chrtrans/makefile.in @@ -1,4 +1,4 @@ -# $LynxId: makefile.in,v 1.40 2015/10/08 00:26:34 Atsuhito.Kohda Exp $ +# $LynxId: makefile.in,v 1.41 2017/07/04 22:46:05 tom Exp $ # # Makefile for the makeuctb and unicode tables. # @@ -135,7 +135,7 @@ makeuctb$o : $(srcdir)/UCkd.h $(srcdir)/makeuctb.c .c.i: @RULE_CC@ - @ECHO_CC@$(BUILD_CPP) -C $(CPP_OPTS) $(srcdir)/$*.c >$@ + @ECHO_CC@$(BUILD_CPP) $(CPP_OPTS) $(srcdir)/$*.c >$@ .tbl.h: ./$(MAKEUCTB) $(srcdir)/$*.tbl $*.h |