(regexp-opt): Always return a properly-grouped regexp.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b18c3e3b0762bac194916eb8d3febc71f766148..9f20d1915285111d11e6a99394d83bf9d17512c8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/regexp-opt.el (regexp-opt): Always return
+       a properly-grouped regexp.
+
 2008-05-23  Juanma Barranquero  <lekktu@gmail.com>
 
        * progmodes/cap-words.el (capitalized-words-mode):

diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index 70f7141210db998b567458ecd047b32cf00b8736..309c8e7bb89db222773c6dd3262f2f06a4e4d5e1 100644 (file)
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -107,7 +107,7 @@ by \\=\\< and \\>."
           (open (cond ((stringp paren) paren) (paren "\\(")))
           (sorted-strings (delete-dups
                            (sort (copy-sequence strings) 'string-lessp)))
-          (re (regexp-opt-group sorted-strings open)))
+          (re (regexp-opt-group sorted-strings (or open t) (not open))))
       (if words (concat "\\<" re "\\>") re))))
 
 ;;;###autoload