[Emacs-diffs] /srv/bzr/emacs/trunk r107267: Merge changes made in No Gnus

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 107267
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2012-02-13 14:14:18 +0000
message:
  Merge changes made in No Gnus
  
  gnus.texi (Customizing the IMAP Connection): Mention nnimap-record-commands.
  nnimap.el (nnimap-record-commands): New variable.
   (nnimap-log-command): Use it.
   (nnimap-make-process-buffer): Add a space to the process buffer.
modified:
  doc/misc/ChangeLog
  doc/misc/gnus.texi
  lisp/gnus/ChangeLog
  lisp/gnus/nnimap.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-02-10 03:23:47 +0000
+++ b/doc/misc/ChangeLog        2012-02-13 14:14:18 +0000
@@ -1,3 +1,8 @@
+2012-02-13  Lars Ingebrigtsen  <address@hidden>
+
+       * gnus.texi (Customizing the IMAP Connection): Mention
+       nnimap-record-commands.
+
 2012-02-10  Glenn Morris  <address@hidden>
 
        * url.texi (Retrieving URLs): Update url-retrieve arguments.

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2012-02-07 22:17:11 +0000
+++ b/doc/misc/gnus.texi        2012-02-13 14:14:18 +0000
@@ -14227,8 +14227,9 @@
 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
address@hidden
 
 @item nnimap-fetch-partial-articles
 If address@hidden, fetch partial articles from the server.  If set to
@@ -14236,6 +14237,10 @@
 matching types will be fetched.  For instance, @samp{"text/"} will
 fetch all textual parts, while leaving the rest on the server.
 
address@hidden nnimap-record-commands
+If address@hidden, record all @acronym{IMAP} commands in the
address@hidden"*imap log*"} buffer.
+
 @end table
 
 

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-02-13 03:33:11 +0000
+++ b/lisp/gnus/ChangeLog       2012-02-13 14:14:18 +0000
@@ -1,5 +1,9 @@
 2012-02-13  Lars Ingebrigtsen  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2012-02-12 22:20:48 +0000
+++ b/lisp/gnus/nnimap.el       2012-02-13 14:14:18 +0000
@@ -289,7 +289,7 @@
 
 (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)
@@ -1696,13 +1696,17 @@
     (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)