diff options
| author | Gnus developers <ding@gnus.org.noreply> | 2014-01-31 01:56:00 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2014-01-31 01:56:00 +0000 |
| commit | 4e2b87d871a623ec36206dff573bf76df8eca12d (patch) | |
| tree | 8e9adbe3a247ce8dd8fe6801afa4a27bb729320a /lisp/gnus/nnmail.el | |
| parent | a1a04df94c2cdea0f24733aa9b1892ee7ba50b13 (diff) | |
| download | emacs-4e2b87d871a623ec36206dff573bf76df8eca12d.tar.gz | |
Misc bugfixes made in Gnus master
2014-01-31 Alex Schroeder <alex@gnu.org> (tiny change)
* gnus-tut.txt (Message-ID): Typo fix (bug#15556).
2014-01-31 Dave Abrahams <dave@boostpro.com>
* gnus-salt.el (gnus-tree-highlight-article): Don't move point around
in the summary buffer (bug#13769).
2014-01-31 Lars Ingebrigtsen <larsi@gnus.org>
* gnus-art.el (gnus-article-setup-buffer): Refresh the summary buffer
name if we're using a single article buffer. Otherwise, it may point
to a killed buffer (bug#13756).
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.
* spam.el (spam-initialize): Allow calling repeatedly, but only run the
the code once (bug#9069).
Diffstat (limited to 'lisp/gnus/nnmail.el')
| -rw-r--r-- | lisp/gnus/nnmail.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el index 2817b54020a..6c6025b3fd2 100644 --- a/lisp/gnus/nnmail.el +++ b/lisp/gnus/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)))))) |