[gnus git] branch master updated: m0-9-56-g9850b99 =1= nnmail.el (nnmail-expand-newtext): Further sub-match fixups (bug#12375)

       via  9850b9927df1b942efb2ed75c5055857a51b0251 (commit)
      from  ec520e59ed7dca1b6b38800b32dfe5776093c7b7 (commit)


- Log -----------------------------------------------------------------
commit 9850b9927df1b942efb2ed75c5055857a51b0251
Author: Lars Ingebrigtsen <[email protected]>
Date:   Wed Feb 12 08:57:10 2014 +0000

    nnmail.el (nnmail-expand-newtext): Further sub-match fixups (bug#12375)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fb165c6..28381ea 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-12  Lars Ingebrigtsen  <[email protected]>
+
+	* nnmail.el (nnmail-expand-newtext): Further sub-match fixups
+	(bug#12375).
+
 2014-02-10  Katsumi Yamaoka  <[email protected]>
 
 	* gnus-art.el (gnus-article-goto-part): Find a button in the body first.
diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index d88a1bf..d1a0455 100644
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -1393,7 +1393,7 @@ See the documentation for the variable `nnmail-split-fancy' for details."
      ((stringp split)
       (when nnmail-split-tracing
 	(push split nnmail-split-trace))
-      (list (nnmail-expand-newtext split)))
+      (list (nnmail-expand-newtext split t)))
 
      ;; Junk the message.
      ((eq split 'junk)
@@ -1513,7 +1513,7 @@ See the documentation for the variable `nnmail-split-fancy' for details."
 	;; on the same split, which will find it immediately in the cache.
 	(nnmail-split-it split))))))
 
-(defun nnmail-expand-newtext (newtext)
+(defun nnmail-expand-newtext (newtext &optional fancyp)
   (let ((len (length newtext))
 	(pos 0)
 	c expanded beg N did-expand)
@@ -1538,6 +1538,10 @@ See the documentation for the variable `nnmail-split-fancy' for details."
 	  (if (= c ?\&)
 	      (setq N 0)
 	    (setq N (- c ?0)))
+	  ;; We wrapped the searches in parentheses, so we have to
+	  ;; add some parentheses here...
+	  (when fancyp
+	    (setq N (+ N 3)))
 	  (when (match-beginning N)
 	    (push (if nnmail-split-lowercase-expanded
 		      (downcase (buffer-substring (match-beginning N)

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog |    5 +++++
 lisp/nnmail.el |    8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project