From 8ba7737821d9ecb6735867296472da3ecd250f91 Mon Sep 17 00:00:00 2001
From: David Aspinall
Date: Mon, 21 Jul 2008 17:16:08 +0000
Subject: proof-ids-to-regexp: Use word-symbol constituent match \_< \_> in GNU
 Emacs, with improvement due to Stefan Monnier.  No change for XEmacs.

---
 generic/proof-syntax.el | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'generic/proof-syntax.el')

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."
-- 
cgit v1.2.3