From b12f45eae16c1be269eb0b35668e03c09aed831c Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Mon, 6 Aug 2012 03:01:39 +0200 Subject: [PATCH] int, nnimap: remove to-buffer in request-head Signed-off-by: Julien Danjou --- lisp/ChangeLog | 5 +++++ lisp/gnus-int.el | 13 +++++-------- lisp/nnimap.el | 4 ++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1fb9e881a..9e1cc6e4a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2012-08-06 Julien Danjou + * nnimap.el (nnimap-request-article): Remove to-buffer argument. + + * gnus-int.el (gnus-request-head): Remove to-buffer argument, only + supported by nnimap actually. Reverts previous change. + * gnus-int.el (gnus-request-head): Add an optional to-buffer parameter to mimic `gnus-request-article' and enjoy backends the nn*-request-head to-buffer argument that is already supported. diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el index 98980603b..339e3d951 100644 --- a/lisp/gnus-int.el +++ b/lisp/gnus-int.el @@ -581,9 +581,8 @@ real group. Does nothing on a real group." (and (bound-and-true-p gnus-registry-enabled) (gnus-try-warping-via-registry)))))) -(defun gnus-request-head (article group &optional to-buffer) - "Request the head of ARTICLE in GROUP. -If TO-BUFFER, insert the article in that buffer." +(defun gnus-request-head (article group) + "Request the head of ARTICLE in GROUP." (let* ((gnus-command-method (gnus-find-method-for-group group)) (head (gnus-get-function gnus-command-method 'request-head t)) res clean-up) @@ -601,15 +600,13 @@ If TO-BUFFER, insert the article in that buffer." ;; Use `head' function. ((fboundp head) (setq res (funcall head article (gnus-group-real-name group) - (nth 1 gnus-command-method) - to-buffer))) + (nth 1 gnus-command-method)))) ;; Use `article' function. (t - (setq res (gnus-request-article article group to-buffer) + (setq res (gnus-request-article article group) clean-up t))) (when clean-up - (with-current-buffer (or to-buffer - nntp-server-buffer) + (with-current-buffer nntp-server-buffer (goto-char (point-min)) (when (search-forward "\n\n" nil t) (delete-region (1- (point)) (point-max))) diff --git a/lisp/nnimap.el b/lisp/nnimap.el index ebd268e3b..e195b428a 100644 --- a/lisp/nnimap.el +++ b/lisp/nnimap.el @@ -597,7 +597,7 @@ textual parts.") (nnheader-ms-strip-cr))) (cons group article))))))) -(deffoo nnimap-request-head (article &optional group server to-buffer) +(deffoo nnimap-request-head (article &optional group server) (when group (setq group (nnimap-decode-gnus-group group))) (when (nnimap-change-group group server) @@ -610,7 +610,7 @@ textual parts.") article (format "UID FETCH %%d %s" (nnimap-header-parameters))) (let ((buffer (current-buffer))) - (with-current-buffer (or to-buffer nntp-server-buffer) + (with-current-buffer nntp-server-buffer (erase-buffer) (insert-buffer-substring buffer) (nnheader-ms-strip-cr) -- 2.34.1