aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Aspinall1999-10-20 14:56:03 +0000
committerDavid Aspinall1999-10-20 14:56:03 +0000
commite651c5a1151bdc0915aad8084954097517d5c1b4 (patch)
tree790e6a161a46d00b7190548fc6788390a015023f
parent184faa177451c95b89433ebe7eb0929cfff4e97c (diff)
Made proof-site only load once.
-rw-r--r--CHANGES3
-rw-r--r--generic/proof-site.el3
2 files changed, 6 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index b7fb9fb9..7c3db8b9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -153,5 +153,8 @@ Internal changes for developers to note
To help with this there is a new configuration variable
proof-shell-eager-annotation-start-length.
+* proof-site now does nothing if it has already been loaded.
+ Previously it would load again, possibly altering settings.
+
* Many code cleanups and improvements.
diff --git a/generic/proof-site.el b/generic/proof-site.el
index 24ed03e6..7612191d 100644
--- a/generic/proof-site.el
+++ b/generic/proof-site.el
@@ -10,6 +10,8 @@
;; NB: Normally you will not need to edit this file.
;;
+(unless (featurep 'proof-site) ; don't load twice
+
(if (or (not (boundp 'emacs-major-version))
(< emacs-major-version 20))
(error "Proof General is not compatible with Emacs %s" emacs-version))
@@ -267,6 +269,7 @@ Note: to change proof assistant, you must start a new Emacs session.")
"Version string identifying Proof General release.")
(provide 'proof-site)
+) ; end unless