Restore fancy split match data reliably

* nnmail.el (nnmail-split-it): Instead of redoing the search to restore
the match data, just save and restore it explictly (bug#12375).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ae0a4a..366b71c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2014-01-30  Lars Ingebrigtsen  <larsi@gnus.org>
 
+       * nnmail.el (nnmail-split-it): Instead of redoing the search to restore
+       the match data, just save and restore it explictly (bug#12375).
+
        * gnus-sum.el (gnus-summary-read-group-1): Initialize the spam code if
        that's needed.
 

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 2817b54..6c6025b 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -1430,12 +1430,14 @@ See the documentation for the variable `nnmail-split-fancy' for details."
      ;; Check the cache for the regexp for this split.
      ((setq cached-pair (assq split nnmail-split-cache))
       (let (split-result
+           match-data
            (end-point (point-max))
            (value (nth 1 split)))
        (if (symbolp value)
            (setq value (cdr (assq value nnmail-split-abbrev-alist))))
        (while (and (goto-char end-point)
                    (re-search-backward (cdr cached-pair) nil t))
+         (setq match-data (match-data))
          (when nnmail-split-tracing
            (push split nnmail-split-trace))
          (let ((split-rest (cddr split))
@@ -1464,12 +1466,9 @@ See the documentation for the variable `nnmail-split-fancy' for details."
                (setq split-rest (cddr split-rest))))
            (when split-rest
              (goto-char end)
-             (let ((value (nth 1 split)))
-               (if (symbolp value)
-                   (setq value (cdr (assq value nnmail-split-abbrev-alist))))
-               ;; Someone might want to do a \N sub on this match, so get the
-               ;; correct match positions.
-               (re-search-backward value start-of-value))
+             ;; Someone might want to do a \N sub on this match, so
+             ;; restore the match data.
+             (set-match-data match-data)
              (dolist (sp (nnmail-split-it (car split-rest)))
                (unless (member sp split-result)
                  (push sp split-result))))))