diff options
| author |  David Aspinall <da@inf.ed.ac.uk> | 2008-07-24 09:51:53 +0000 |
|---|---|---|
| committer | David Aspinall <da@inf.ed.ac.uk> | 2008-07-24 09:51:53 +0000 |
| commit | 76d6b0b2b1f039549d308a0d2c478a6b05869af9 (patch) | |
| tree | 78cc7e13bf290a17e7006a6d4616a8a08e36ce8f /generic/proof-auxmodes.el | |
| parent | 8f8e9388b582ad6d3ee6e1eea842a8d443d4ce89 (diff) | |
Merge changes from Version4Branch.
Diffstat (limited to 'generic/proof-auxmodes.el')
| -rw-r--r-- | generic/proof-auxmodes.el | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/generic/proof-auxmodes.el b/generic/proof-auxmodes.el index f8ea8da6..d204154f 100644 --- a/generic/proof-auxmodes.el +++ b/generic/proof-auxmodes.el @@ -7,9 +7,7 @@ ;;; Commentary: ;; ;; Startup code from auxiliary modes are collected here, allowing late -;; loading of their main defining files. -;; -;; TODO: add x-symbol here too and disentangle elsewhere. +;; loading of their main defining files and the possibility to disable them. ;; (require 'proof-utils) ; proof-ass, proof-eval... @@ -47,7 +45,6 @@ (defun proof-maths-menu-support-available () "A test to see whether maths-menu support is available." (and - (not (featurep 'xemacs)) ;; not XEmacs compatible (or (featurep 'maths-menu) ;; *should* always succeed unless bundled version broken (proof-try-require 'maths-menu)) @@ -65,11 +62,9 @@ ;; (defun proof-unicode-tokens-support-available () "A test to see whether unicode tokens support is available." - (and - (or (featurep 'unicode-tokens) - (proof-try-require 'unicode-tokens)) - ;; Requires prover-specific config in <foo>-unicode-tokens.el - (proof-try-require (proof-ass-sym unicode-tokens)))) + ;; Requires prover-specific config in <foo>-unicode-tokens.el + ;; Loaded before unicode-tokens.el to allow load-time config there + (proof-try-require (proof-ass-sym unicode-tokens))) (proof-eval-when-ready-for-assistant (if (and (proof-ass unicode-tokens-enable) |