From 095f526ebe9e507d5a77568c2c83dbc7c172b354 Mon Sep 17 00:00:00 2001
From: David Aspinall
Date: Tue, 13 Apr 2004 13:02:05 +0000
Subject: Tweak disabling of X-Symbol packages to allow user to delete x-symbol
 subdir.

---
 generic/proof-site.el | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'generic')

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
-- 
cgit v1.2.3