diff options
| -rw-r--r-- | coq/coq-syntax.el | 29 | ||||
| -rw-r--r-- | coq/coq.el | 25 | ||||
| -rw-r--r-- | phox/phox-sym-lock.el | 2 | ||||
| -rw-r--r-- | phox/phox-tags.el | 4 | ||||
| -rw-r--r-- | phox/phox.el | 5 | ||||
| -rw-r--r-- | twelf/twelf-old.el | 2 |
6 files changed, 37 insertions, 30 deletions
diff --git a/coq/coq-syntax.el b/coq/coq-syntax.el index 006e20d1..39897057 100644 --- a/coq/coq-syntax.el +++ b/coq/coq-syntax.el @@ -11,10 +11,37 @@ (require 'proof-syntax) -;; ----- keywords for font-lock. +;; da 15/2/03: without defvars compilation breaks +;; This may have broken some of logic below +(defvar coq-version-is-V74 nil) +(defvar coq-version-is-V7 nil) + + +;; Pierre: we will have both versions V6 and V7 during a while the test with "coqtop +;; -v" can be skipped if the variable coq-version-is-V7 is already set (useful for +;; people dealing with several version of coq) We also have coq-version-is-V74, to +;; deal with the new module system +(cond + ((boundp 'coq-version-is-V74) (setq coq-version-is-V7 t)) + ((boundp 'coq-version-is-V7) (setq coq-version-is-V74 nil)) + (t + (let* ((str (shell-command-to-string (concat coq-prog-name " -v"))) + (x (string-match "version \\([.0-9]*\\)" str)) + (num (match-string 1 str))) + (cond + ((string-match num "\\<6.") + (message "coq is V6") (setq coq-version-is-V7 nil) (setq coq-version-is-V74 nil)) + ((or (string-match num "\\<7.0") (string-match num "\\<7.1") + (string-match num "\\<7.2") (string-match num "\\<7.3")) + (message "coq is V7 =< 7.3") + (setq coq-version-is-V7 t) (setq coq-version-is-V74 nil)) + ;default: 7.3.1 and above ---> 7.4 + (t (message "coq is => V7.3.1") + (setq coq-version-is-V7 t) (setq coq-version-is-V74 t)))))) +;; ----- keywords for font-lock. (defvar coq-keywords-decl @@ -24,29 +24,8 @@ (defconst coq-shell-init-cmd (format "Set Undo %s. " coq-default-undo-limit)) - -;; Pierre: we will have both versions V6 and V7 during a while the test with "coqtop -;; -v" can be skipped if the variable coq-version-is-V7 is already set (useful for -;; people dealing with several version of coq) We also have coq-version-is-V74, to -;; deal with the new module system -(cond - ((boundp 'coq-version-is-V74) (setq coq-version-is-V7 t)) - ((boundp 'coq-version-is-V7) (setq coq-version-is-V74 nil)) - (t - (let* ((str (shell-command-to-string (concat coq-prog-name " -v"))) - (x (string-match "version \\([.0-9]*\\)" str)) - (num (match-string 1 str))) - (cond - ((string-match num "\\<6.") - (message "coq is V6") (setq coq-version-is-V7 nil) (setq coq-version-is-V74 nil)) - ((or (string-match num "\\<7.0") (string-match num "\\<7.1") - (string-match num "\\<7.2") (string-match num "\\<7.3")) - (message "coq is V7 =< 7.3") - (setq coq-version-is-V7 t) (setq coq-version-is-V74 nil)) - ;default: 7.3.1 and above ---> 7.4 - (t (message "coq is => V7.3.1") - (setq coq-version-is-V7 t) (setq coq-version-is-V74 t)))))) - +;; da 15/02/03: moved setting of coq-version-is-vX to coq-syntax to +;; fix compilation (require 'coq-syntax) ;; Command to reset the Coq Proof Assistant diff --git a/phox/phox-sym-lock.el b/phox/phox-sym-lock.el index 1c4e4cae..668f6e8e 100644 --- a/phox/phox-sym-lock.el +++ b/phox/phox-sym-lock.el @@ -29,7 +29,7 @@ ;; more about symbol font ? check out: xfd -fn '-adobe-symbol-*--12-*' (require 'font-lock) -(require 'atomic-extents) +(proof-try-require 'atomic-extents) ;; da: proof-try-require for Emacs compat (defvar phox-sym-lock-sym-count 0 "Counter for internal symbols.") diff --git a/phox/phox-tags.el b/phox/phox-tags.el index dc143230..e24e6ce7 100644 --- a/phox/phox-tags.el +++ b/phox/phox-tags.el @@ -109,10 +109,6 @@ "Phox menu for dealing with tags" ) -;; default - -(if phox-tags-doc (add-hook 'phox-mode-hook 'phox-tags-add-doc-table)) - (provide 'phox-tags) diff --git a/phox/phox.el b/phox/phox.el index 5fadf597..88d4588a 100644 --- a/phox/phox.el +++ b/phox/phox.el @@ -79,6 +79,11 @@ (require 'phox-tags) (require 'phox-outline) +;; default for tags [da: moved here to fix compilation 15/02/03] + +(if phox-tags-doc + (add-hook 'phox-mode-hook 'phox-tags-add-doc-table)) + ;; ----- PhoX specific menu diff --git a/twelf/twelf-old.el b/twelf/twelf-old.el index 61b21745..41e570f3 100644 --- a/twelf/twelf-old.el +++ b/twelf/twelf-old.el @@ -203,7 +203,7 @@ ;;; Added NT Emacs bug workaround (require 'comint) -(require 'auc-menu) +(require 'easymenu) ;;;---------------------------------------------------------------------- ;;; User visible variables |