diff options
| -rw-r--r-- | generic/proof-site.el | 17 |
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 |