diff options
| author | David Aspinall | 2008-07-21 17:16:08 +0000 |
|---|---|---|
| committer | David Aspinall | 2008-07-21 17:16:08 +0000 |
| commit | 8ba7737821d9ecb6735867296472da3ecd250f91 (patch) | |
| tree | 5bc6ab4c8ef2c46832078f8127ab5bce4b30b666 | |
| parent | 5e8ff235a4b74a0ab716e9c59bb7961daf5bde7c (diff) | |
proof-ids-to-regexp: Use word-symbol constituent match \_< \_> in GNU Emacs,
with improvement due to Stefan Monnier. No change for XEmacs.
| -rw-r--r-- | generic/proof-syntax.el | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/generic/proof-syntax.el b/generic/proof-syntax.el index b31c040b..482cc5e0 100644 --- a/generic/proof-syntax.el +++ b/generic/proof-syntax.el @@ -12,13 +12,11 @@ (require 'proof-config) ; proof-case-fold-search (require 'proof-compat) ; proof-buffer-syntactic-context -;; TODO da: would regexp-opt be better here? Or maybe -;; (concat "\\<" (regexp-opt l) "\\>") (defun proof-ids-to-regexp (l) "Maps a non-empty list of tokens `l' to a regexp matching any element" - (mapconcat (lambda (s) (concat "\\<" s "\\>")) l "\\|")) -;; Stefan Monnier suggests: -;; (concat "\\<\\(?:" (mapconcat 'identity l "\\|") "\\)\\>")) + (if (featurep 'xemacs) + (mapconcat (lambda (s) (concat "\\_<" s "\\_>")) l "\\|") ;; old version + (concat "\\_<\\(?:" (mapconcat 'identity l "\\|") "\\)\\_>"))) (defun proof-anchor-regexp (e) "Anchor (\\`) and group the regexp E." |