about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorThomas E. Dickey <dickey@invisible-island.net>2019-09-06 09:07:57 +0000
committerThomas E. Dickey <dickey@invisible-island.net>2019-09-06 09:07:57 +0000
commit28e198c31560c65e954097dec178d444e6867d5a (patch)
tree95a952d4d24b2b71c655a54a1f4f5ae812c224cc
parenta842356299078e35e1feb589ec1741d0ac4eadd7 (diff)
downloadlynx-snapshots-28e198c31560c65e954097dec178d444e6867d5a.tar.gz
snapshot of project "lynx", label v2-9-0dev_4c
-rw-r--r--CHANGES4
-rw-r--r--src/LYStyle.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index b24a1128..5b4a10d0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,11 @@
--- $LynxId: CHANGES,v 1.1027 2019/09/06 08:36:32 tom Exp $
+-- $LynxId: CHANGES,v 1.1028 2019/09/06 09:07:57 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
 2019-09-06 (2.9.0dev.5)
+* if --without-lss-file is used, the configured lss filename is empty and
+  should be ignored (report by Cory Krell) -TD
 * extend table/limit in parsdate.y to 2200 (report by Ian Collier) -TD
 * update eo.po, fr.po from
     http://translationproject.org/latest/lynx
diff --git a/src/LYStyle.c b/src/LYStyle.c
index c73b7897..c7aa52b3 100644
--- a/src/LYStyle.c
+++ b/src/LYStyle.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYStyle.c,v 1.109 2018/03/10 01:54:30 tom Exp $
+ * $LynxId: LYStyle.c,v 1.110 2019/09/06 09:00:48 tom Exp $
  *
  * character level styles for Lynx
  * (c) 1996 Rob Partington -- donated to the Lyncei (if they want it :-)
@@ -932,10 +932,12 @@ void init_color_styles(char **from_cmdline, const char *default_styles)
     }
     CTRACE1((tfp, "init_color_styles(%s)\n", NonNull(lynx_lss_file)));
 
+    if (isEmpty(lynx_lss_file))
+	return;
     /*
      * If the lynx-style file is not available, inform the user and exit.
      */
-    if (isEmpty(lynx_lss_file) || !LYCanReadFile(lynx_lss_file)) {
+    if (!LYCanReadFile(lynx_lss_file)) {
 	fprintf(stderr, gettext("\nLynx file \"%s\" is not available.\n\n"),
 		NonNull(cp));
 	exit_immediately(EXIT_FAILURE);