[Emacs-diffs] trunk r116414: * nnmail.el (nnmail-expand-newtext): Further sub-match fixups (bug#12375).

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 116414
revision-id: address@hidden
parent: address@hidden
committer: Lars Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Tue 2014-02-11 21:48:39 -0800
message:
  * nnmail.el (nnmail-expand-newtext): Further sub-match fixups (bug#12375).
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/nnmail.el            nnmail.el-20091113204419-o5vbwnq5f7feedwu-1156

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2014-02-09 04:37:38 +0000
+++ b/lisp/gnus/ChangeLog       2014-02-12 05:48:39 +0000
@@ -1,3 +1,8 @@
+2014-02-12  Lars Ingebrigtsen  <address@hidden>
+
+       * nnmail.el (nnmail-expand-newtext): Further sub-match fixups
+       (bug#12375).
+
 2014-02-09  Lars Ingebrigtsen  <address@hidden>
 
        * message.el (message-tab): Mention what happens on normal tabs

=== modified file 'lisp/gnus/nnmail.el'
--- a/lisp/gnus/nnmail.el       2014-01-31 01:56:00 +0000
+++ b/lisp/gnus/nnmail.el       2014-02-12 05:48:39 +0000
@@ -1542,6 +1542,9 @@
          (if (= c ?\&)
              (setq N 0)
            (setq N (- c ?0)))
+         ;; We wrapped the searches in parentheses, so we have to
+         ;; add some parentheses here...
+         (setq N (+ N 3))
          (when (match-beginning N)
            (push (if nnmail-split-lowercase-expanded
                      (downcase (buffer-substring (match-beginning N)