Merge remote-tracking branch 'refs/remotes/origin/master'

.dir_colors

@@ -154,6 +154,8 @@ STICKY_OTHER_WRITABLE	34;45	# Dir is other-writable and sticky (o+w,+t).
 .TZ	01;31
 .tz2	01;31
 .TZ2	01;31
+tzst	01;31
+TZST	01;31
 .xz	01;31
 .XZ	01;31
 .z	01;31
@@ -162,6 +164,8 @@ STICKY_OTHER_WRITABLE	34;45	# Dir is other-writable and sticky (o+w,+t).
 .ZIP	01;31
 .zoo	01;31
 .ZOO	01;31
+.zst	01;31
+.ZST	01;31
 
 # Images (bright magenta).
 .bmp	01;35
@@ -296,8 +300,12 @@ STICKY_OTHER_WRITABLE	34;45	# Dir is other-writable and sticky (o+w,+t).
 .AXA	01;33
 .flac	01;33
 .FLAC	01;33
+.flv	01;33
+.FLV	01;33
 .m2a	01;33
 .M2A	01;33
+.m2t	01;33
+.M2T	01;33
 .m4a	01;33
 .M4A	01;33
 .m4p	01;33
@@ -340,6 +348,10 @@ STICKY_OTHER_WRITABLE	34;45	# Dir is other-writable and sticky (o+w,+t).
 .SPX	01;33
 .wav	01;33
 .WAV	01;33
+.webm	01;33
+.WEBM	01;33
+.webp	01;33
+.WEBP	01;33
 .wma	01;33
 .WMA	01;33
 

.lynx.cfg

@@ -478,7 +478,7 @@ CHARACTER_SET:utf-8
 # ASSUME_CHARSET can also be changed via the 'o'ptions menu but will
 # not be saved as permanent value in user's .lynxrc file to avoid more chaos.
 #
-ASSUME_CHARSET:iso-8859-1
+ASSUME_CHARSET:utf-8
 
 .h2 ASSUMED_DOC_CHARSET_CHOICE
 .h2 DISPLAY_CHARSET_CHOICE
@@ -1301,6 +1301,16 @@ TAGSOUP:TRUE
 
 .h1 Cookies
 
+# Select the RFC cookie version using the RFC number.  Most users will not
+# need to change this, but because RFC 6265 makes incompatible changes versus
+# the older RFCs, it is interesting to compare behavior.
+#
+# For reference:
+.url http://tools.ietf.org/html/rfc6265
+.url http://tools.ietf.org/html/rfc2965
+.url http://tools.ietf.org/html/rfc2109
+#COOKIE_VERSION:RFC-6265
+
 .h2 SET_COOKIES
 # If SET_COOKIES is set FALSE, Lynx will ignore Set-Cookie headers
 # in http server replies.  Note that if a COOKIE_FILE is in use (see
@@ -3020,6 +3030,12 @@ COLOR_STYLE:/etc/lynx.lss
 #
 NESTED_TABLES:TRUE
 
+.h2 NO_TABLE_CENTER
+# Normally table cells are centered on the table grid.
+# Set this option to true to disable centering.
+# The -center command-line option toggles this setting between true/false.
+#NO_TABLE_CENTER: false
+
 .h2 ASSUMED_COLOR
 # If built with a library that recognizes default colors (usually ncurses or
 # slang), and if the corresponding option is compiled into lynx, lynx
@@ -3405,6 +3421,8 @@ ENABLE_LYNXRC:FORCE_COOKIE_PROMPT:ON
 ENABLE_LYNXRC:FORCE_SSL_PROMPT:ON
 ENABLE_LYNXRC:FTP_PASSIVE:ON
 ENABLE_LYNXRC:HTML5_CHARSETS:ON
+ENABLE_LYNXRC:HTTP_PROTOCOL:1.0
+ENABLE_LYNXRC:IDNA_MODE:TR46
 ENABLE_LYNXRC:KBLAYOUT:ON
 ENABLE_LYNXRC:KEYPAD_MODE:ON
 ENABLE_LYNXRC:LINEEDIT_MODE:ON
@@ -3592,6 +3610,13 @@ SSL_CERT_FILE:/etc/ssl/certs/ca-certificates.crt
 # This is the same as the command-line "-notitle" option.
 #NO_TITLE:FALSE
 
+.h2 UPDATE_TERM_TITLE
+# Enables updating the title in terminal emulators.
+# If your terminal emulator supports that escape code,
+# you can set this to TRUE.
+# This is the same as the command-line "-update_term_title" option.
+#UPDATE_TERM_TITLE:FALSE
+
 .h1 External Programs
 
 .h2 SYSLOG_REQUESTED_URLS
@@ -3762,3 +3787,53 @@ SHORT_URL:TRUE
 .h2 WITH_BACKSPACES
 # Emit backspaces in output if -dump'ing or -crawl'ing (like 'man' does).
 #WITH_BACKSPACES:FALSE
+
+.h1 Internal Behavior
+.h2 HTTP_PROTOCOL
+# Normally Lynx negotiates HTTP/1.0, because it does not support chunked
+# transfer (a requirement for all HTTP/1.1 clients), although it supports
+# several other features of HTTP/1.1.  You may encounter a server which does
+# not support HTTP/1.0 which can be used by switching to the later protocol.
+#HTTP_PROTOCOL:1.0
+
+.h2 GUESS_SCHEME
+# When true, Lynx may fill in a missing "scheme" for URIs which you provide.
+# This is different from URL_DOMAIN_PREFIXES and URL_DOMAIN_SUFFIXES.
+#
+# If no "scheme" (such as "http:", "ftp:") is given in a URI, Lynx first checks
+# if there is a corresponding local file which can be accessed directly.
+# Failing that, Lynx may inspect the URI to see if it begins with a prefix
+# which implies a scheme.
+#
+# Lynx uses these schemes for the corresponding prefixes:
+#
+# cso:
+#  "cso."
+#  "ns."
+#  "ph."
+# ftp:
+#  "ftp."
+# gopher:
+#  "gopher."
+# http:
+#  "www".
+# news:
+#   "news."
+# nntp:
+#   "nntp."
+# wais:
+#  "wais."
+#
+# The default value FALSE disables this guess, telling Lynx to just assume that
+# "http:" was intended.
+#GUESS_SCHEME:FALSE
+
+.h2 REDIRECTION_LIMIT
+# HTTP 1.0 suggested a redirection-limit of 5; lynx doubled that.  Some users
+# believe they can improve their experience with a higher limit.
+#REDIRECTION_LIMIT:10
+
+.h1 Appearance
+.h2 LIST_DECODED
+# For -dump, show URL-encoded links decoded.
+#LIST_DECODED:TRUE