From b8aa85e6e5a027d44d53ce9e8a723a3cd660c016 Mon Sep 17 00:00:00 2001 From: David Aspinall Date: Thu, 1 Jun 2000 14:06:22 +0000 Subject: Use proof-running-on-XEmacs variable. --- generic/proof-config.el | 6 +++--- generic/proof-shell.el | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/generic/proof-config.el b/generic/proof-config.el index 22cdb9ad..00ab5f08 100644 --- a/generic/proof-config.el +++ b/generic/proof-config.el @@ -148,7 +148,7 @@ done if this `proof-strict-state-preserving' is turned off (nil)." ;; conjunction with font-lock. ;; The second conjunctive ensures that the expression is either ;; `nil' or `strict' (and not 15!!). - (and (string-match "XEmacs" emacs-version) 'strict) + (and proof-running-on-XEmacs 'strict) "*Whether Proof General is strict about the read-only region in buffers. If non-nil, an error is given when an attempt is made to edit the read-only region. If nil, Proof General is more relaxed (but may give @@ -1884,9 +1884,9 @@ Proof General." " Please send problems and suggestions to proofgen@dcs.ed.ac.uk, or use the menu command Proof-General -> Submit bug report." nil - (unless (string-match "XEmacs" emacs-version) + (unless proof-running-on-XEmacs "For a better Proof General experience, please use XEmacs") - (unless (string-match "XEmacs" emacs-version) + (unless proof-running-on-XEmacs "(visit http://www.xemacs.org)")) "Evaluated to configure splash screen displayed when entering Proof General. A list of the screen contents. If an element is a string or an image diff --git a/generic/proof-shell.el b/generic/proof-shell.el index 70d65465..46c8a1d4 100644 --- a/generic/proof-shell.el +++ b/generic/proof-shell.el @@ -266,7 +266,7 @@ Does nothing if proof assistant is already running." ;; (defcustom proof-shell-active-scripting-indicator - (if (string-match "XEmacs" emacs-version) + (if proof-running-on-XEmacs (cons (make-extent nil nil) " Scripting ") " Scripting") "Modeline indicator for active scripting buffer. @@ -276,7 +276,7 @@ of the queue region." :group 'proof-general-internals) (cond - ((string-match "XEmacs" emacs-version) + (proof-running-on-XEmacs (if (extentp (car proof-shell-active-scripting-indicator)) (set-extent-properties (car proof-shell-active-scripting-indicator) @@ -986,7 +986,7 @@ the proof assistant." (defvar proof-shell-insert-space-fudge (cond ((string-match "21.*XEmacs" emacs-version) " ") - ((string-match "XEmacs" emacs-version) "") + (proof-running-on-XEmacs "") (t " ")) "String to insert after setting proof marker to prevent it moving. Allows for a difference between different versions of comint across @@ -1937,7 +1937,7 @@ May enable proof-by-pointing or similar features. ;; defined-derived-mode proof-goals-mode initialises proof-goals-mode-map (setq proof-buffer-type 'goals) (cond - ((string-match "XEmacs" emacs-version) + (proof-running-on-XEmacs (define-key proof-goals-mode-map [(button2)] 'pbp-button-action) (define-key proof-goals-mode-map [(control button2)] 'proof-undo-and-delete-last-successful-command) ;; button 2 is a nuisance on 2 button mice, so we'll do 1 as well. -- cgit v1.2.3