[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master a0844f1 1/5: Clean up nnimap-request-move-article s
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master a0844f1 1/5: Clean up nnimap-request-move-article slightly |
Date: |
Sun, 14 Feb 2016 06:19:46 +0000 |
branch: master
commit a0844f15cad956a31f8a2cdb22df9ac9962ea95a
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Clean up nnimap-request-move-article slightly
* lisp/gnus/nnheader.el (subr-x): Require.
* lisp/gnus/nnimap.el (nnimap-request-move-article): Clean up
the code slightly.
---
lisp/gnus/nnheader.el | 1 +
lisp/gnus/nnimap.el | 27 ++++++++++++++-------------
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index 9f4d1b9..191a908 100644
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -40,6 +40,7 @@
(require 'mail-utils)
(require 'mm-util)
(require 'gnus-util)
+(require 'subr-x)
(autoload 'gnus-range-add "gnus-range")
(autoload 'gnus-remove-from-range "gnus-range")
;; FIXME none of these are used explicitly in this file.
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 66096ff..fc9304f 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -913,7 +913,8 @@ textual parts.")
t)
(deffoo nnimap-request-move-article (article group server accept-form
- &optional _last
internal-move-group)
+ &optional _last
+ internal-move-group)
(setq group (nnimap-decode-gnus-group group))
(when internal-move-group
(setq internal-move-group (nnimap-decode-gnus-group internal-move-group)))
@@ -923,17 +924,18 @@ textual parts.")
'nnimap-request-head
'nnimap-request-article)
article group server (current-buffer))
- ;; If the move is internal (on the same server), just do it the easy
- ;; way.
+ ;; If the move is internal (on the same server), just do it the
+ ;; easy way.
(let ((message-id (message-field-value "message-id")))
(if internal-move-group
(with-current-buffer (nnimap-buffer)
(let* ((can-move (nnimap-capability "MOVE"))
- (command (if can-move
- "UID MOVE %d %S"
- "UID COPY %d %S"))
- (result (nnimap-command command article
- (utf7-encode internal-move-group
t))))
+ (command (if can-move
+ "UID MOVE %d %S"
+ "UID COPY %d %S"))
+ (result (nnimap-command
+ command article
+ (utf7-encode internal-move-group t))))
(when (and (car result) (not can-move))
(nnimap-delete-article article))
(cons internal-move-group
@@ -942,11 +944,10 @@ textual parts.")
internal-move-group server message-id
nnimap-request-articles-find-limit)))))
;; Move the article to a different method.
- (let ((result (eval accept-form)))
- (when result
- (nnimap-change-group group server)
- (nnimap-delete-article article)
- result)))))))
+ (when-let ((result (eval accept-form)))
+ (nnimap-change-group group server)
+ (nnimap-delete-article article)
+ result))))))
(deffoo nnimap-request-expire-articles (articles group &optional server force)
(setq group (nnimap-decode-gnus-group group))