Merge remote-tracking branch 'origin/no-gnus'

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c708c7f..69fd5ae 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,16 @@
        * gnus-demon.el (gnus-demon-init): Don't multiply time twice.
        Reported by Peter Münster.
 
+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.
+
+2012-02-19  Vida Gábor  <vidagabor@gmail.com>  (tiny change)
+
+       * gnus-demon.el (gnus-demon-init): Don't multiply time twice.
+       Reported by Peter Münster.
+
 2012-02-18  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * shr.el (shr-image-fetched): Make sure we really kill the right
@@ -12,13 +22,6 @@
 
        * gnus-start.el (gnus-1): Avoid duplicate entries.
 
-2012-02-16  Lars Ingebrigtsen  <larsi@gnus.org>
-
-       * mm-decode.el (mm-dissect-singlepart): Guess what the type of
-       application/octet-stream parts really is.
-
-       * gnus-sum.el (gnus-propagate-marks): Remove.
-
 2012-02-15  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * imap.el: Remove.
@@ -30,6 +33,13 @@
        * gnus-start.el (gnus-clean-old-newsrc): Delete `unexist' from pre-Ma
        Gnus 0.3.
 
+2012-02-16  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * mm-decode.el (mm-dissect-singlepart): Guess what the type of
+       application/octet-stream parts really is.
+
+       * gnus-sum.el (gnus-propagate-marks): Remove.
+
 2012-02-15  Paul Eggert  <eggert@cs.ucla.edu>
 
        * shr.el (shr-rescale-image): Undo previous change; see

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index a131c10..eaf0f5c 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -1730,7 +1730,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))))