[gnus git] branch master updated: m0-9-70-gfb7eca7 =1= Misc changes made in Emacs trunk

       via  fb7eca794a7f006d316f1003f5ecc4e5ac8d4002 (commit)
      from  8ace698e1ce1772d7a7431f947d47591c2ac0656 (commit)


- Log -----------------------------------------------------------------
commit fb7eca794a7f006d316f1003f5ecc4e5ac8d4002
Author: Katsumi Yamaoka <[email protected]>
Date:   Sun Mar 9 10:29:15 2014 +0000

    Misc changes made in Emacs trunk
    
    2014-03-07  Lars Ingebrigtsen  <[email protected]>
      * nnimap.el (nnimap-request-accept-article): Make respooling to nnimap
        groups work again.
    2014-03-07  George McNinch  <[email protected]>  (tiny change)
      * nnir.el (nnir-run-namazu): Parse namazu results that are larger than
        999 correctly (i.e. "1,342").
    2014-03-07  Lars Ingebrigtsen  <[email protected]>
      * gnus-agent.el (gnus-agent-update-files-total-fetched-for): Don't bug
        out if the directory doesn't exist.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index de18488..6c8315a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2014-03-07  Lars Ingebrigtsen  <[email protected]>
+
+	* nnimap.el (nnimap-request-accept-article): Make respooling to nnimap
+	groups work again.
+
+2014-03-07  George McNinch  <[email protected]>  (tiny change)
+
+	* nnir.el (nnir-run-namazu): Parse namazu results that are larger than
+	999 correctly (i.e. "1,342").
+
+2014-03-07  Lars Ingebrigtsen  <[email protected]>
+
+	* gnus-agent.el (gnus-agent-update-files-total-fetched-for): Don't bug
+	out if the directory doesn't exist.
+
 2014-03-07  Daiki Ueno  <[email protected]>
 
 	* mml2015.el (mml2015-use): Don't check the availability of GnuPG
diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 432aabb..67525ee 100644
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -4121,8 +4121,8 @@ CLEAN is obsolete and ignored."
 (defun gnus-agent-group-covered-p (group)
   (gnus-agent-method-p (gnus-group-method group)))
 
-(defun gnus-agent-update-files-total-fetched-for
-  (group delta &optional method path)
+(defun gnus-agent-update-files-total-fetched-for (group delta
+							&optional method path)
   "Update, or set, the total disk space used by the articles that the
 agent has fetched."
   (when gnus-agent-total-fetched-hashtb
@@ -4135,6 +4135,7 @@ agent has fetched."
 		       (gnus-sethash path (make-list 3 0)
 				     gnus-agent-total-fetched-hashtb)))
 	    (file-name-coding-system nnmail-pathname-coding-system))
+       (when (file-exists-p path)
 	 (when (listp delta)
 	   (if delta
 	       (let ((sum 0.0)
@@ -4148,14 +4149,15 @@ agent has fetched."
 						   file)))) 0))))
 		 (setq delta sum))
 	     (let ((sum (- (nth 2 entry)))
-		 (info (directory-files-and-attributes path nil "^-?[0-9]+$" t))
+		   (info (directory-files-and-attributes
+			  path nil "^-?[0-9]+$" t))
 		   file)
 	       (while (setq file (pop info))
 		 (incf sum (float (or (nth 8 file) 0))))
 	       (setq delta sum))))
 
 	 (setq gnus-agent-need-update-total-fetched-for t)
-       (incf (nth 2 entry) delta)))))
+	 (incf (nth 2 entry) delta))))))
 
 (defun gnus-agent-update-view-total-fetched-for
   (group agent-over &optional method path)
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index f0accb9..1730bd4 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -1115,6 +1115,14 @@ If LIMIT, first try to limit the search to the N last articles."
 	  (nnimap-wait-for-response sequence))))))
 
 (deffoo nnimap-request-accept-article (group &optional server last)
+  (unless group
+    ;; We're respooling.  Find out where mail splitting would place
+    ;; this article.
+    (setq group
+	  (caar
+	   (nnmail-article-group
+	    `(lambda (group)
+	       (nnml-active-number group ,server))))))
   (setq group (nnimap-decode-gnus-group group))
   (when (nnimap-change-group nil server)
     (nnmail-check-syntax)
diff --git a/lisp/nnir.el b/lisp/nnir.el
index d678517..e2051df 100644
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -1483,7 +1483,7 @@ Tested with Namazu 2.0.6 on a GNU/Linux system."
 
       (goto-char (point-min))
       (while (re-search-forward
-              "^\\([0-9]+\\.\\).*\\((score: \\([0-9]+\\)\\))\n\\([^ ]+\\)"
+              "^\\([0-9,]+\\.\\).*\\((score: \\([0-9]+\\)\\))\n\\([^ ]+\\)"
               nil t)
         (setq score (match-string 3)
               group (file-name-directory (match-string 4))

-----------------------------------------------------------------------
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     |   15 +++++++++++++++
 lisp/gnus-agent.el |   44 +++++++++++++++++++++++---------------------
 lisp/nnimap.el     |    8 ++++++++
 lisp/nnir.el       |    2 +-
 4 files changed, 47 insertions(+), 22 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