diff options
| author | Makarius Wenzel | 2001-01-12 16:50:38 +0000 |
|---|---|---|
| committer | Makarius Wenzel | 2001-01-12 16:50:38 +0000 |
| commit | e5384e11dedcb416eff5df7c96aa0f1e4f943c37 (patch) | |
| tree | 5d7cd974fa9337abb5e04e87f00a86e0990d3233 /isar | |
| parent | b5140e7b23bf27d7938d924c37b4e82181ce18ed (diff) | |
proof-string-match;
Diffstat (limited to 'isar')
| -rw-r--r-- | isar/isar-syntax.el | 2 | ||||
| -rw-r--r-- | isar/isar.el | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/isar/isar-syntax.el b/isar/isar-syntax.el index 89e78b87..d79ca239 100644 --- a/isar/isar-syntax.el +++ b/isar/isar-syntax.el @@ -125,7 +125,7 @@ (defun isar-ids-to-regexp (l) "Maps a non-empty list of tokens `l' to a regexp matching any element" (mapconcat - (lambda (s) (if (string-match "^\\W$" s) s (concat "\\<" s "\\>"))) + (lambda (s) (if (proof-string-match "^\\W$" s) s (concat "\\<" s "\\>"))) l "\\|")) (defconst isar-long-id-stuff "\\([A-Za-z0-9'_.]+\\)") diff --git a/isar/isar.el b/isar/isar.el index a1356705..b76d15b4 100644 --- a/isar/isar.el +++ b/isar/isar.el @@ -404,7 +404,7 @@ proof-shell-retract-files-regexp." (defun isar-global-save-command-p (span str) "Decide whether argument really is a global save command" (or - (string-match isar-global-save-command-regexp str) + (proof-string-match isar-global-save-command-regexp str) (let ((ans nil) (lev 0) cmd) (while (and (not ans) span (setq span (prev-span span 'type))) (setq cmd (span-property span 'cmd)) @@ -474,9 +474,9 @@ proof-shell-retract-files-regexp." (defun isar-preprocessing () ;dynamic scoping of `string' "Insert sync markers - acts on variable STRING by dynamic scoping" - (if (string-match isabelle-verbatim-regexp string) + (if (proof-string-match isabelle-verbatim-regexp string) (setq string (match-string 1 string)) - (unless (string-match ";[ \t]*\\'" string) + (unless (proof-string-match ";[ \t]*\\'" string) (setq string (concat string ";"))) (setq string (concat "\\<^sync>" @@ -489,7 +489,7 @@ proof-shell-retract-files-regexp." ;; comment end in proof-script.el's function ;; proof-segment-upto-cmdstart (which becomes even more ;; Isar specific, then...) - ;; (if (string-match "\\.ML$" (buffer-name proof-script-buffer)) + ;; (if (proof-string-match "\\.ML$" (buffer-name proof-script-buffer)) ;; (format "ML_command {* %s *};" string) ;; string) string |