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).

1 files changed, 3 insertions, 4 deletions

diff --git a/generic/proof-syntax.el b/generic/proof-syntax.el
index 4fa9a6c3..5a96ec05 100644
--- a/generic/proof-syntax.el
+++ b/generic/proof-syntax.el
@@ -9,7 +9,6 @@
 ;;
 
 (require 'font-lock)
-(require 'proof-config)
 
 ;; FIXME da: would regexp-opt be better here?  Or maybe
 ;;  (concat "\\<" (regexp-opt l) "\\>")
@@ -122,17 +121,17 @@ If so, return non-nil."
 
 ;; Replacing matches
 
-(defun proof-replace-string (string to-string)
+(defsubst proof-replace-string (string to-string)
   "Non-interactive `replace-string', using `proof-case-fold-search'."
   (while (proof-search-forward string nil t)
     (replace-match to-string nil t)))
 
-(defun proof-replace-regexp (regexp to-string)
+(defsubst proof-replace-regexp (regexp to-string)
   "Non-interactive `replace-regexp', using `proof-case-fold-search'."
   (while (proof-re-search-forward regexp nil t)
     (replace-match to-string nil nil)))
 
-(defun proof-replace-regexp-nocasefold (regexp to-string)
+(defsubst proof-replace-regexp-nocasefold (regexp to-string)
   "Non-interactive `replace-regexp', forcing `case-fold-search' to nil."
   (let ((case-fold-search nil))
     (while (proof-re-search-forward regexp nil t)