Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up nnimap-request-move-article slightly

Browse source 
* lisp/gnus/nnheader.el (subr-x): Require.

* lisp/gnus/nnimap.el (nnimap-request-move-article): Clean up
the code slightly.
This commit is contained in:
Lars Ingebrigtsen 2016-02-14 15:41:02 +11:00
parent 598ff2349e
commit a0844f15ca
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lisp/gnus/nnheader.el
View file

@ -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.

27
lisp/gnus/nnimap.el
View file

@ -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))