Merge from trunk.

[bpt/emacs.git] / lisp / textmodes / reftex.el

diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index a41409f..21083fd 100644 (file)
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -1081,13 +1081,7 @@ This enforces rescanning the buffer on next use."
            (wbol "\\(^\\)[ \t]*") ; Need to keep the empty group because
                                   ; match numbers are hard coded
            (label-re (concat "\\(?:"
-                            ;; Normal \label{...}
-                            "\\\\label{\\([^}]*\\)}"
-                            "\\|"
-                            ;; keyvals [..., label = {foo}, ...]
-                            ;; forms used by ctable, listings,
-                            ;; minted, ...
-                            "\\[[^]]*label[[:space:]]*=[[:space:]]*{?\\(?1:[^],}]+\\)}?"
+                            (mapconcat 'identity reftex-label-regexps "\\|")
                             "\\)"))
            (include-re (concat wbol
                                "\\\\\\("
@@ -2464,7 +2458,7 @@ information about your RefTeX version and configuration."
   (require 'reporter)
   (let ((reporter-prompt-for-summary-p "Bug report subject: "))
     (reporter-submit-bug-report
-     "bug-auctex@gnu.org"
+     "bug-auctex@gnu.org, bug-gnu-emacs@gnu.org"
      reftex-version
      (list 'window-system
           'reftex-plug-into-AUCTeX)