From 0c0e2d6de3deed85b515ebe39a17683496fe33c9 Mon Sep 17 00:00:00 2001
From: John Tytgat <joty@netsurf-browser.org>
Date: Sat, 4 Dec 2010 13:31:04 +0000
Subject: Don't overrule NetSurf$Dir, NetSurf$Help, NetSurf$Web, NetSurf$Title,
 NetSurf$Publisher and NetSurf$Description unless NetSurf$ForceVars is set to
 1.

Based on feedback in "Margins" mail thread @ NetSurf ML.

svn path=/trunk/netsurf/; revision=10956
---
 !NetSurf/!Boot,feb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to '!NetSurf')

diff --git a/!NetSurf/!Boot,feb b/!NetSurf/!Boot,feb
index 1312ba9ea..b1d9edc3d 100644
--- a/!NetSurf/!Boot,feb
+++ b/!NetSurf/!Boot,feb
@@ -14,7 +14,7 @@
 | variable, which is set by the !Run file prior to calling this file.
 
 | Set up NetSurf$Dir
-Set NetSurf$Dir <Obey$Dir>
+If (("<NetSurf$Dir>" = "") OR ("<NetSurf$ForceVars>" = "1")) Then Set NetSurf$Dir <Obey$Dir>
 
 | Filetype -> Type name mappings
 |
@@ -36,11 +36,11 @@ Set File$Type_FAF HTML
 | Application system variables
 |
 | See http://www.iyonix.com/32bit/help.shtml for more details.
-Set NetSurf$Help <NetSurf$Dir>.Docs.docs_en
-Set NetSurf$Web "http://www.netsurf-browser.org/"
-Set NetSurf$Title "NetSurf"
-Set NetSurf$Publisher "The NetSurf Developers"
-Set NetSurf$Description "Web browser"
+If (("<NetSurf$Help>" = "") OR ("<NetSurf$ForceVars>" = "1")) Then Set NetSurf$Help <NetSurf$Dir>.Docs.docs_en
+If (("<NetSurf$Web>" = "") OR ("<NetSurf$ForceVars>" = "1")) Then Set NetSurf$Web "http://www.netsurf-browser.org/"
+If (("<NetSurf$Title>" = "") OR ("<NetSurf$ForceVars>" = "1")) Then Set NetSurf$Title "NetSurf"
+If (("<NetSurf$Publisher>" = "") OR ("<NetSurf$ForceVars>" = "1")) Then Set NetSurf$Publisher "The NetSurf Developers"
+If (("<NetSurf$Description>" = "") OR ("<NetSurf$ForceVars>" = "1")) Then Set NetSurf$Description "Web browser"
 
 | NetSurf Sprites
 |
-- 
cgit v1.2.3