# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1211563162 0
# Node ID 4ec6f3d46f2745699f5b8b0b9934a6aa81f968b8
# Parent  9360d63720be9a3a4cb9fef2c582f8761fc1c006
(regexp-opt): Always return a properly-grouped regexp.

diff -r 9360d63720be -r 4ec6f3d46f27 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri May 23 15:31:17 2008 +0000
+++ b/lisp/ChangeLog	Fri May 23 17:19:22 2008 +0000
@@ -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 -r 9360d63720be -r 4ec6f3d46f27 lisp/emacs-lisp/regexp-opt.el
--- a/lisp/emacs-lisp/regexp-opt.el	Fri May 23 15:31:17 2008 +0000
+++ b/lisp/emacs-lisp/regexp-opt.el	Fri May 23 17:19:22 2008 +0000
@@ -107,7 +107,7 @@
 	   (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