From: Katsumi Yamaoka Date: Sun, 9 Mar 2014 10:29:15 +0000 (+0000) Subject: Misc changes made in Emacs trunk X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=fb7eca794a7f006d316f1003f5ecc4e5ac8d4002 Misc changes made in Emacs trunk 2014-03-07 Lars Ingebrigtsen * nnimap.el (nnimap-request-accept-article): Make respooling to nnimap groups work again. 2014-03-07 George McNinch (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 * 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 de18488b2..6c8315ab8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,18 @@ +2014-03-07 Lars Ingebrigtsen + + * nnimap.el (nnimap-request-accept-article): Make respooling to nnimap + groups work again. + +2014-03-07 George McNinch (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 + + * 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 * mml2015.el (mml2015-use): Don't check the availability of GnuPG diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index 432aabbc4..67525ee0c 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,27 +4135,29 @@ agent has fetched." (gnus-sethash path (make-list 3 0) gnus-agent-total-fetched-hashtb))) (file-name-coding-system nnmail-pathname-coding-system)) - (when (listp delta) - (if delta - (let ((sum 0.0) + (when (file-exists-p path) + (when (listp delta) + (if delta + (let ((sum 0.0) + file) + (while (setq file (pop delta)) + (incf sum (float (or (nth 7 (file-attributes + (nnheader-concat + path + (if (numberp file) + (number-to-string file) + file)))) 0)))) + (setq delta sum)) + (let ((sum (- (nth 2 entry))) + (info (directory-files-and-attributes + path nil "^-?[0-9]+$" t)) file) - (while (setq file (pop delta)) - (incf sum (float (or (nth 7 (file-attributes - (nnheader-concat - path - (if (numberp file) - (number-to-string file) - file)))) 0)))) - (setq delta sum)) - (let ((sum (- (nth 2 entry))) - (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)))) + (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))))) + (setq gnus-agent-need-update-total-fetched-for t) + (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 f0accb98c..1730bd425 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 d678517b2..e2051dfd3 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))