path: root/amiga/dist
diff options
authorChris Young <>2010-04-01 17:44:42 +0000
committerChris Young <>2010-04-01 17:44:42 +0000
commitd3276dfbafa0c18dcb6c62b57f619da152f23584 (patch)
tree9dd0578d96029e41cd2faacfbe2c31d9dc432fe9 /amiga/dist
parent0194e4bb55ca90f447344403ed01fea5a7a3fed6 (diff)
netsurf_init expects a char ***, not a char **
Change command template so URL is a keyword. This avoids the platform code re-interpreting core options (eg -v as a URL). Move screen open code slightly so "NetSurf ?" shows the template visibly, rather than opening an empty screen and the user not knowing what is happening. svn path=/trunk/netsurf/; revision=10224
Diffstat (limited to 'amiga/dist')
2 files changed, 8 insertions, 6 deletions
diff --git a/amiga/dist/Install b/amiga/dist/Install
index d05edab13..a0879eccd 100755
--- a/amiga/dist/Install
+++ b/amiga/dist/Install
@@ -470,10 +470,10 @@
; Unfortunately saving URL prefs overwrites the markers making it
; necessary to ask whether the user wants to add NetSurf to launch-handler.
(working "Adding NetSurf to launch-handler config")
- (p_fitr "ENVARC:launch-handler/URL/FILE.LH" "ClientName=\"NETSURF\" ClientPath=\"APPDIR:NETSURF\" CMDFORMAT=\"*\"file:///%s*\"\"")
- (p_fitr "ENVARC:launch-handler/URL/HTTP.LH" "ClientName=\"NETSURF\" ClientPath=\"APPDIR:NETSURF\" CMDFORMAT=\"*\"http://%s*\"\"")
- (p_fitr "ENVARC:launch-handler/URL/HTTPS.LH" "ClientName=\"NETSURF\" ClientPath=\"APPDIR:NETSURF\" CMDFORMAT=\"*\"https://%s*\"\"")
- (p_fitr "ENVARC:launch-handler/URL/WWW.LH" "ClientName=\"NETSURF\" ClientPath=\"APPDIR:NETSURF\" CMDFORMAT=\"*\"http://www.%s*\"\"")
+ (p_fitr "ENVARC:launch-handler/URL/FILE.LH" "ClientName=\"NETSURF\" ClientPath=\"APPDIR:NETSURF\" CMDFORMAT=\"URL=*\"file:///%s*\"\"")
+ (p_fitr "ENVARC:launch-handler/URL/HTTP.LH" "ClientName=\"NETSURF\" ClientPath=\"APPDIR:NETSURF\" CMDFORMAT=\"URL=*\"http://%s*\"\"")
+ (p_fitr "ENVARC:launch-handler/URL/HTTPS.LH" "ClientName=\"NETSURF\" ClientPath=\"APPDIR:NETSURF\" CMDFORMAT=\"URL=*\"https://%s*\"\"")
+ (p_fitr "ENVARC:launch-handler/URL/WWW.LH" "ClientName=\"NETSURF\" ClientPath=\"APPDIR:NETSURF\" CMDFORMAT=\"URL=*\"http://www.%s*\"\"")
diff --git a/amiga/dist/ b/amiga/dist/
index d824eb008..5cec3dd0e 100755
--- a/amiga/dist/
+++ b/amiga/dist/
@@ -23,12 +23,14 @@
@node cli "Command line options"
-NetSurf URL
-URL = address of page to open on startup.
+URL = Address of page to open on startup
+FORCE = Force new instance of NetSurf to open
+Note that there may be other generic options which can also be specified.
@node options "Options file"