branch: master
commit 141bbee49f75668591aa90e93e74ed0583e2d63e
Author: Dmitry Gutov <[email protected]>
Commit: Dmitry Gutov <[email protected]>
Remove regexp-opt's legacy stuff
https://sourceforge.net/tracker/?func=detail&aid=832660&group_id=8658&atid=308658
http://list-archive.xemacs.org/pipermail/xemacs-beta/2004-January/000147.html
---
mmm-compat.el | 24 +++---------------------
1 file changed, 3 insertions(+), 21 deletions(-)
diff --git a/mmm-compat.el b/mmm-compat.el
index 01842fd..f46510b 100644
--- a/mmm-compat.el
+++ b/mmm-compat.el
@@ -70,29 +70,11 @@
`(defvar ,var ,value ,doc)))
;;}}}
-;;{{{ Regexp-Opt (Emacs 19)
-
-(condition-case ()
- (require 'regexp-opt)
- (error nil))
-
-(unless (and (featurep 'regexp-opt)
- (fboundp 'regexp-opt))
- ;; No regexp-opt; create one
- (defun regexp-opt (strings &optional paren)
- (concat (if paren "\\(" "")
- (mapconcat 'regexp-quote strings "\\|")
- (if paren "\\)" ""))))
-
-;;}}}
;;{{{ Regexp-Opt (XEmacs)
-(defmacro mmm-regexp-opt (strings paren)
- "Act like FSF Emacs' `regexp-opt', whichever Emacs we're in.
-XEmacs' `regexp-opt' requires an extra parameter to do grouping."
- (if (featurep 'xemacs)
- `(regexp-opt ,strings ,paren t)
- `(regexp-opt ,strings ,paren)))
+;; As of XEmacs' xemacs-base package version 1.82,
+;; the regexp-opt API is compatible with GNU Emacs.
+(defalias 'mmm-regexp-opt 'regexp-opt)
;;}}}
;;{{{ Overlays (XEmacs)
