[Emacs-diffs] trunk r116415: Fix the last patch to work from non-fancy splits, too

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 116415
revision-id: address@hidden
parent: address@hidden
committer: Lars Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Tue 2014-02-11 21:51:37 -0800
message:
  Fix the last patch to work from non-fancy splits, too
modified:
  lisp/gnus/nnmail.el            nnmail.el-20091113204419-o5vbwnq5f7feedwu-1156

=== modified file 'lisp/gnus/nnmail.el'
--- a/lisp/gnus/nnmail.el       2014-02-12 05:48:39 +0000
+++ b/lisp/gnus/nnmail.el       2014-02-12 05:51:37 +0000
@@ -1397,7 +1397,7 @@
      ((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)
@@ -1517,7 +1517,7 @@
        ;; 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)
@@ -1544,7 +1544,8 @@
            (setq N (- c ?0)))
          ;; We wrapped the searches in parentheses, so we have to
          ;; add some parentheses here...
-         (setq N (+ N 3))
+         (when fancyp
+           (setq N (+ N 3)))
          (when (match-beginning N)
            (push (if nnmail-split-lowercase-expanded
                      (downcase (buffer-substring (match-beginning N)