aboutsummaryrefslogtreecommitdiffhomepage
path: root/generic/proof-site.el
diff options
context:
space:
mode:
authorGravatar David Aspinall <da@inf.ed.ac.uk>2004-04-13 13:02:05 +0000
committerGravatar David Aspinall <da@inf.ed.ac.uk>2004-04-13 13:02:05 +0000
commit095f526ebe9e507d5a77568c2c83dbc7c172b354 (patch)
tree823e8094b685dbb4f1064a2fca9cb8ee32c0f683 /generic/proof-site.el
parent51c518b58fea79104daa1fabddfa4d338448f341 (diff)
Tweak disabling of X-Symbol packages to allow user to
delete x-symbol subdir.
Diffstat (limited to 'generic/proof-site.el')
-rw-r--r--generic/proof-site.el17
1 files changed, 10 insertions, 7 deletions
diff --git a/generic/proof-site.el b/generic/proof-site.el
index fe2425c2..da4ec4cc 100644
--- a/generic/proof-site.el
+++ b/generic/proof-site.el
@@ -402,13 +402,16 @@ proof-assistant-table."
;;; Disable any other XEmacs x-symbol packages: we load ours manually
;;;
-(if proof-running-on-XEmacs
-(defadvice packages-new-autoloads (after ignore-other-x-symbols activate)
- (setq ad-return-value
- (delete-if (lambda (pkg)
- (string-match "x-symbol" pkg))
- ad-return-value))))
-
+(if (and
+ proof-running-on-XEmacs
+ (not (featurep 'x-symbol-hooks)) ;; unless already loaded
+ (file-exists-p (concat proof-home-directory ;; or our version removed
+ "x-symbol/lisp/")))
+ (defadvice packages-new-autoloads (after ignore-other-x-symbols activate)
+ (setq ad-return-value
+ (delete-if (lambda (pkg)
+ (string-match "x-symbol" pkg))
+ ad-return-value))))
(provide 'proof-site))
;; proof-site.el ends here