aboutsummaryrefslogtreecommitdiff
path: root/generic
diff options
context:
space:
mode:
authorDavid Aspinall1998-10-21 10:17:17 +0000
committerDavid Aspinall1998-10-21 10:17:17 +0000
commit119b804454c73a44be3d77739edb6a1d863d1da1 (patch)
tree0e12c7f3fc106807a3d068d5ce5ed2d11f1ce0d9 /generic
parente0e7e40ab33ba12033834a83839d1333f7b229a8 (diff)
Changed from forcing w3 to using customizable browse-url
Diffstat (limited to 'generic')
-rw-r--r--generic/proof-site.el4
-rw-r--r--generic/proof.el25
2 files changed, 21 insertions, 8 deletions
diff --git a/generic/proof-site.el b/generic/proof-site.el
index 85a83007..97b4dc7e 100644
--- a/generic/proof-site.el
+++ b/generic/proof-site.el
@@ -102,9 +102,9 @@ You can use customize to set this variable."
proof-internal-assistant-table)
(concat
"*Choice of proof assitants to use with Proof General.
-A list of symbols chosen from: "
+A list of symbols chosen from:"
(apply 'concat (mapcar (lambda (astnt)
- (concat "'" (symbol-name (car astnt)) " "))
+ (concat " '" (symbol-name (car astnt))))
proof-internal-assistant-table))
".\nEach proof assistant defines its own instance of Proof General,
providing session control, script management, etc. Proof General
diff --git a/generic/proof.el b/generic/proof.el
index 26cffe60..0965c400 100644
--- a/generic/proof.el
+++ b/generic/proof.el
@@ -198,7 +198,12 @@ No effect if proof-display-splash-time is zero."
(require 'proof-syntax)
(require 'proof-indent)
-(autoload 'w3-fetch "w3" nil t) ; FIXME: shouldn't we use browse-url?
+
+;; browse-url function doesn't seem to be autoloaded in
+;; XEmacs 20.4, is in FSF Emacs 20.2.
+(or (fboundp 'browse-url)
+ (autoload 'browse-url "browse-url"
+ "Ask a WWW browser to load URL." t))
(defmacro deflocal (var value &optional docstring)
"Define a buffer local variable VAR with default value VALUE."
@@ -231,6 +236,12 @@ No effect if proof-display-splash-time is zero."
"*If non-nil, format for newlines after each proof command in a script."
:type 'boolean
:group 'proof)
+
+(defcustom proof-general-home-page
+ "http://www.dcs.ed.ac.uk/home/proofgen"
+ "*Web address for Proof General"
+ :type 'string
+ :group 'proof-internal)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -2593,11 +2604,13 @@ Start up the proof assistant if necessary."
(proof-restart-script))
(defvar proof-help-menu
- '("Help"
- ["Proof assistant web page"
- (w3-fetch proof-www-home-page) t]
- ["Help on Emacs proof-mode" proof-info-mode t]
- )
+ `("Help"
+ [,(concat proof-assistant " web page")
+ (browse-url proof-www-home-page) t]
+ ["Proof General home page"
+ (browse-url proof-general-home-page) t]
+ ["Proof General Info" proof-info-mode t]
+ )
"The Help Menu in Script Management.")
(defvar proof-shared-menu