merge from no gnus

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e3bf51c..8632a55 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,14 @@
        * shr.el (shr-rescale-image): Allow viewing large images.
        (shr-rescale-image): Fix wrong merge.
 
+2012-02-13  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * nnimap.el (nnimap-record-commands): New variable.
+       (nnimap-log-command): Use it.
+       (nnimap-make-process-buffer): Add a space to the process buffer.
+
+       * shr.el (shr-rescale-image): Allow viewing large images.
+
 2012-02-12  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * nnml.el (nnml-request-compact-group): Delete the marks file after

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index a78346c..e0bb5a0 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -289,7 +289,7 @@ textual parts.")
 
 (defun nnimap-make-process-buffer (buffer)
   (with-current-buffer
-      (generate-new-buffer (format "*nnimap %s %s %s*"
+      (generate-new-buffer (format " *nnimap %s %s %s*"
                                   nnimap-address nnimap-server-port
                                   (gnus-buffer-exists-p buffer)))
     (mm-disable-multibyte)
@@ -1720,13 +1720,17 @@ textual parts.")
     (nnimap-wait-for-response nnimap-sequence))
   nnimap-sequence)
 
+(defvar nnimap-record-commands nil
+  "If non-nil, log commands to the \"*imap log*\" buffer.")
+
 (defun nnimap-log-command (command)
-  (with-current-buffer (get-buffer-create "*imap log*")
-    (goto-char (point-max))
-    (insert (format-time-string "%H:%M:%S") " "
-           (if nnimap-inhibit-logging
-               "(inhibited)\n"
-             command)))
+  (when nnimap-record-commands
+    (with-current-buffer (get-buffer-create "*imap log*")
+      (goto-char (point-max))
+      (insert (format-time-string "%H:%M:%S") " "
+             (if nnimap-inhibit-logging
+                 "(inhibited)\n"
+               command))))
   command)
 
 (defun nnimap-command (&rest args)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 6894461..940f867 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -17,6 +17,11 @@
 
        * gnus.texi (Key Index): Change encoding to utf-8.
 
+2012-02-13  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus.texi (Customizing the IMAP Connection): Mention
+       nnimap-record-commands.
+
 2012-02-07  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * gnus.texi (Mail Source Specifiers): Add a pop3 via an SSH tunnel

diff --git a/texi/gnus.texi b/texi/gnus.texi
index fb1f539..ed882d2 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -14253,8 +14253,9 @@ if the server supports UID EXPUNGE, but it's not done by default on
 servers that doesn't support that command.
 
 @item nnimap-streaming
-Virtually all @code{IMAP} server support fast streaming of data.  If
-you have problems connecting to the server, try setting this to @code{nil}.
+Virtually all @acronym{IMAP} server support fast streaming of data.
+If you have problems connecting to the server, try setting this to
+@code{nil}.
 
 @item nnimap-fetch-partial-articles
 If non-@code{nil}, fetch partial articles from the server.  If set to
@@ -14262,6 +14263,10 @@ a string, then it's interpreted as a regexp, and parts that have
 matching types will be fetched.  For instance, @samp{"text/"} will
 fetch all textual parts, while leaving the rest on the server.
 
+@item nnimap-record-commands
+If non-@code{nil}, record all @acronym{IMAP} commands in the
+@samp{"*imap log*"} buffer.
+
 @end table