nnimap.el: IMAP command logging improvement; When moving articles between IMAP servers, delete from the correct server

2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e7473c463a9..387693f9ae0 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-20  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * nnimap.el (nnimap-log-command): Add the IMAP address to the log
+        buffer.  Suggested by Herbert Valerio Riedel.
+        (nnimap-request-move-article): Delete the message from the correct IMAP
+        server.
+
 2012-02-19  Vida Gábor  <vidagabor@gmail.com>  (tiny change)
 
         * gnus-demon.el (gnus-demon-init): Don't multiply time twice.
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index c6f0f7a97e8..6cbd83c8f78 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -868,6 +868,7 @@ textual parts.")
           ;; Move the article to a different method.
           (let ((result (eval accept-form)))
             (when result
+              (nnimap-possibly-change-group group server)
               (nnimap-delete-article article)
               result)))))))
 
@@ -1706,7 +1707,8 @@ textual parts.")
   (when nnimap-record-commands
     (with-current-buffer (get-buffer-create "*imap log*")
       (goto-char (point-max))
-      (insert (format-time-string "%H:%M:%S") " "
+      (insert (format-time-string "%H:%M:%S")
+              " [" nnimap-address "] "
               (if nnimap-inhibit-logging
                   "(inhibited)\n"
                 command))))