From bbc6145531ff3db5ee7809b2ecd400e378b667f7 Mon Sep 17 00:00:00 2001 From: David Aspinall Date: Wed, 19 Feb 2003 13:34:19 +0000 Subject: Use bundled version off mmm first --- generic/proof-mmm.el | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'generic') diff --git a/generic/proof-mmm.el b/generic/proof-mmm.el index c8dc61d6..bf28fbb7 100644 --- a/generic/proof-mmm.el +++ b/generic/proof-mmm.el @@ -13,9 +13,10 @@ ;; ;; ================================================================= ;; -;; NB: mmm-mode is bundled with Proof General. If you have installed -;; mmm-mode already, PG will use that version instead of the bundled -;; version. +;; NB: mmm-mode is bundled with Proof General, and PG will select +;; it's own version before any other version on the Emacs load path. +;; If you want to override this, simply load your version before +;; starting Emacs, with (require 'mmm-auto). ;; ;; Configuration for the prover is expected to reside in -mmm.el ;; It should define an MMM submode class called . @@ -25,14 +26,14 @@ "A test to see whether mmm support is available." (and (or (featurep 'mmm-auto) - (or (proof-try-require 'mmm-auto) ; local install? - (progn - ;; try bundled version - (setq load-path - (cons - (concat proof-home-directory "mmm/") - load-path)) - (proof-try-require 'mmm-auto)))) + (progn + ;; put bundled version on load path + (setq load-path + (cons + (concat proof-home-directory "mmm/") + load-path)) + ;; *should* always succeed unless bundled version broken + (proof-try-require 'mmm-auto))) ;; Load prover-specific config in -mmm.el (proof-try-require (proof-ass-sym mmm)))) -- cgit v1.2.3