|
 |
85fd1a |
From 8c053103d8253f5868807853cb7b921e5cb07214 Mon Sep 17 00:00:00 2001
|
|
|
85fd1a |
From: Kamil Dudka <kdudka@redhat.com>
|
|
|
85fd1a |
Date: Wed, 13 Feb 2013 15:17:08 +0100
|
|
|
85fd1a |
Subject: [PATCH] lynx-2.8.6-redhat.patch rebased for 2.8.8
|
|
|
85fd1a |
|
|
|
85fd1a |
---
|
|
|
85fd1a |
lynx.cfg | 14 +++++++++++---
|
|
|
85fd1a |
userdefs.h | 16 ++++++++--------
|
|
|
85fd1a |
2 files changed, 19 insertions(+), 11 deletions(-)
|
|
|
85fd1a |
|
|
|
85fd1a |
diff --git a/lynx.cfg b/lynx.cfg
|
|
|
85fd1a |
index ee2aad3..f732558 100644
|
|
|
85fd1a |
--- a/lynx.cfg
|
|
|
85fd1a |
+++ b/lynx.cfg
|
|
|
85fd1a |
@@ -1,8 +1,11 @@
|
|
|
85fd1a |
# $LynxId: lynx.cfg,v 1.222 2012/11/14 01:18:19 tom Exp $
|
|
|
85fd1a |
# lynx.cfg file.
|
|
|
85fd1a |
-# The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
|
|
|
85fd1a |
+# The default placement for this file is /etc/lynx.cfg (Red Hat Linux, Fedora)
|
|
|
85fd1a |
# or Lynx_Dir:lynx.cfg (VMS)
|
|
|
85fd1a |
#
|
|
|
85fd1a |
+# Please don't edit this file directly (it is updated with every Red Hat
|
|
|
85fd1a |
+# Linux update, overwriting your changes). Instead, edit /etc/lynx-site.cfg.
|
|
|
85fd1a |
+#
|
|
|
85fd1a |
# $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
|
|
|
85fd1a |
#PRCS LYNX_VERSION "2.8.8dev.15"
|
|
|
85fd1a |
#
|
|
|
85fd1a |
@@ -90,7 +93,7 @@
|
|
|
85fd1a |
#
|
|
|
85fd1a |
# Normally we expect you will connect to a remote site, e.g., the Lynx starting
|
|
|
85fd1a |
# site:
|
|
|
85fd1a |
-STARTFILE:http://lynx.isc.org/
|
|
|
85fd1a |
+STARTFILE:http://start.fedoraproject.org
|
|
|
85fd1a |
#
|
|
|
85fd1a |
# As an alternative, you may want to use a local URL. A good choice for this is
|
|
|
85fd1a |
# the user's home directory:
|
|
|
85fd1a |
@@ -436,7 +439,7 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/
|
|
|
85fd1a |
# Find RFC 1345 at
|
|
|
85fd1a |
.url http://tools.ietf.org/html/rfc1345
|
|
|
85fd1a |
#
|
|
|
85fd1a |
-#CHARACTER_SET:iso-8859-1
|
|
|
85fd1a |
+CHARACTER_SET:utf-8
|
|
|
85fd1a |
|
|
|
85fd1a |
.h2 LOCALE_CHARSET
|
|
|
85fd1a |
# LOCALE_CHARSET overrides CHARACTER_SET if true, using the current locale to
|
|
|
85fd1a |
@@ -1817,6 +1820,10 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/
|
|
|
85fd1a |
.ex
|
|
|
85fd1a |
#DOWNLOADER:Save OS/390 binary file: iconv -f IBM-1047 -t ISO8859-1 %s >%s:FALSE
|
|
|
85fd1a |
|
|
|
85fd1a |
+# Added by Red Hat:
|
|
|
85fd1a |
+DOWNLOADER:View with less:less %s:TRUE
|
|
|
85fd1a |
+
|
|
|
85fd1a |
+
|
|
|
85fd1a |
.h1 Interaction
|
|
|
85fd1a |
|
|
|
85fd1a |
.h2 NO_DOT_FILES
|
|
|
85fd1a |
@@ -3397,6 +3404,7 @@ COLOR:6:brightred:black
|
|
|
85fd1a |
#ENABLE_LYNXRC:VI_KEYS:ON
|
|
|
85fd1a |
#ENABLE_LYNXRC:VISITED_LINKS:ON
|
|
|
85fd1a |
.fi
|
|
|
85fd1a |
+INCLUDE:/etc/lynx-site.cfg
|
|
|
85fd1a |
|
|
|
85fd1a |
.h1 External Programs
|
|
|
85fd1a |
# Any of the compiled-in pathnames of external programs can be overridden
|
|
|
85fd1a |
diff --git a/userdefs.h b/userdefs.h
|
|
|
85fd1a |
index 066e01b..45a1642 100644
|
|
|
85fd1a |
--- a/userdefs.h
|
|
|
85fd1a |
+++ b/userdefs.h
|
|
|
85fd1a |
@@ -105,7 +105,7 @@
|
|
|
85fd1a |
* mailcap files (see the examples in the samples directory).
|
|
|
85fd1a |
*/
|
|
|
85fd1a |
#ifndef LYNX_CFG_FILE
|
|
|
85fd1a |
-#define LYNX_CFG_FILE "Lynx_Dir:lynx.cfg"
|
|
|
85fd1a |
+#define LYNX_CFG_FILE "/etc/lynx.cfg"
|
|
|
85fd1a |
#endif /* LYNX_CFG_FILE */
|
|
|
85fd1a |
|
|
|
85fd1a |
/**************************
|
|
|
85fd1a |
@@ -115,8 +115,8 @@
|
|
|
85fd1a |
* Mappings in these global and personal files override any SUFFIX
|
|
|
85fd1a |
* definitions in lynx.cfg and built-in defaults from src/HTInit.c.
|
|
|
85fd1a |
*/
|
|
|
85fd1a |
-#define GLOBAL_EXTENSION_MAP "Lynx_Dir:mime.types"
|
|
|
85fd1a |
-#define PERSONAL_EXTENSION_MAP "mime.types"
|
|
|
85fd1a |
+#define GLOBAL_EXTENSION_MAP "/etc/mime.types"
|
|
|
85fd1a |
+#define PERSONAL_EXTENSION_MAP ".mime.types"
|
|
|
85fd1a |
|
|
|
85fd1a |
/**************************
|
|
|
85fd1a |
* The MAILCAP file allows you to map file MIME types to
|
|
|
85fd1a |
@@ -125,7 +125,7 @@
|
|
|
85fd1a |
* Mappings in these global and personal files override any VIEWER
|
|
|
85fd1a |
* definitions in lynx.cfg and built-in defaults from src/HTInit.c.
|
|
|
85fd1a |
*/
|
|
|
85fd1a |
-#define GLOBAL_MAILCAP "Lynx_Dir:mailcap"
|
|
|
85fd1a |
+#define GLOBAL_MAILCAP "/etc/mailcap"
|
|
|
85fd1a |
#define PERSONAL_MAILCAP ".mailcap"
|
|
|
85fd1a |
|
|
|
85fd1a |
/**************************
|
|
|
85fd1a |
@@ -295,7 +295,7 @@
|
|
|
85fd1a |
#ifdef DOSPATH
|
|
|
85fd1a |
#define LYNX_CFG_FILE "./lynx.cfg"
|
|
|
85fd1a |
#else
|
|
|
85fd1a |
-#define LYNX_CFG_FILE "/usr/local/lib/lynx.cfg"
|
|
|
85fd1a |
+#define LYNX_CFG_FILE "/etc/lynx.cfg"
|
|
|
85fd1a |
#endif /* DOSPATH */
|
|
|
85fd1a |
#endif /* LYNX_CFG_FILE */
|
|
|
85fd1a |
#endif /* HAVE_CONFIG_H */
|
|
|
85fd1a |
@@ -339,7 +339,7 @@
|
|
|
85fd1a |
* use any default viewers for image types. Note that open is used as
|
|
|
85fd1a |
* the default for NeXT, instead of the XLOADIMAGE_COMMAND definition.
|
|
|
85fd1a |
*/
|
|
|
85fd1a |
-#define XLOADIMAGE_COMMAND "xli %s &"
|
|
|
85fd1a |
+#define XLOADIMAGE_COMMAND "display %s &"
|
|
|
85fd1a |
|
|
|
85fd1a |
/**************************
|
|
|
85fd1a |
* For UNIX systems, SYSTEM_MAIL and SYSTEM_MAIL_FLAGS are set by the
|
|
|
85fd1a |
@@ -360,7 +360,7 @@
|
|
|
85fd1a |
* the "TMPDIR" (unix), or "TEMP" or "TMP" (Windows,DOS,OS/2)
|
|
|
85fd1a |
* variable.
|
|
|
85fd1a |
*/
|
|
|
85fd1a |
-#define TEMP_SPACE "/tmp/"
|
|
|
85fd1a |
+#define TEMP_SPACE "~"
|
|
|
85fd1a |
|
|
|
85fd1a |
/********************************
|
|
|
85fd1a |
* Comment this line out to disable code that implements command logging
|
|
|
85fd1a |
@@ -1162,7 +1162,7 @@
|
|
|
85fd1a |
* OSU server distribution.
|
|
|
85fd1a |
*/
|
|
|
85fd1a |
#ifndef HAVE_CONFIG_H
|
|
|
85fd1a |
-/* #define LYNXCGI_LINKS */
|
|
|
85fd1a |
+#define LYNXCGI_LINKS
|
|
|
85fd1a |
#endif
|
|
|
85fd1a |
|
|
|
85fd1a |
/*********************************
|
|
|
85fd1a |
--
|
|
|
85fd1a |
1.7.1
|
|
|
85fd1a |
|