From 5c326ac3969d8045c78f46aac4f058f16edbc570 Mon Sep 17 00:00:00 2001 From: David Aspinall Date: Tue, 15 Jan 2008 13:05:08 +0000 Subject: Many rearrangements for compatibility, efficient/correct compilation, namespaces fixes. pre-shell-start-hook: remove this, use default names for modes proof-compat: simplify architecture flags, use standard (featurep 'xemacs). --- generic/proof-maths-menu.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'generic/proof-maths-menu.el') diff --git a/generic/proof-maths-menu.el b/generic/proof-maths-menu.el index 99e46bf2..726668cc 100644 --- a/generic/proof-maths-menu.el +++ b/generic/proof-maths-menu.el @@ -18,21 +18,21 @@ ;; starting Emacs, with (require 'maths-menu). ;; -(require 'proof-utils) +(eval-when-compile + (require 'proof-utils)) ; proof-ass, proof-eval-when-ready-for-assistant + ;;;###autoload (defun proof-maths-menu-support-available () "A test to see whether maths-menu support is available." (and - (not proof-running-on-XEmacs) ;; not XEmacs compatible + (not (featurep 'xemacs)) ;; not XEmacs compatible (or (featurep 'maths-menu) ;; *should* always succeed unless bundled version broken (proof-try-require 'maths-menu)) ;; Load any optional prover-specific config in -maths-menu.el (or (proof-try-require (proof-ass-sym maths-menu)) t))) -(eval-when-compile - (proof-maths-menu-support-available)) (defun proof-maths-menu-set-global (flag) "Set global status of maths-menu mode for PG buffers to be FLAG. @@ -61,10 +61,10 @@ in future if we have just activated it for this buffer." ;; ;; On start up, adjust automode according to user setting ;; -(if (and (proof-ass maths-menu-enable) - (proof-maths-menu-support-available)) - (proof-maths-menu-set-global t)) - +(proof-eval-when-ready-for-assistant + (if (and (proof-ass maths-menu-enable) + (proof-maths-menu-support-available)) + (proof-maths-menu-set-global t))) (provide 'proof-maths-menu) ;; End of proof-maths-menu.el -- cgit v1.2.3