From 3d2af1938b425929bddac50fbf3540efcee954d4 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Mon, 13 Feb 2012 14:14:18 +0000 Subject: [PATCH] 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. --- doc/misc/ChangeLog | 5 +++++ doc/misc/gnus.texi | 9 +++++++-- lisp/gnus/ChangeLog | 4 ++++ lisp/gnus/nnimap.el | 18 +++++++++++------- 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index d287b34054..adad93ef89 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2012-02-13 Lars Ingebrigtsen + + * gnus.texi (Customizing the IMAP Connection): Mention + nnimap-record-commands. + 2012-02-10 Glenn Morris * url.texi (Retrieving URLs): Update url-retrieve arguments. diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 865888a28e..c149ddfcf0 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -14227,8 +14227,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 @@ -14236,6 +14237,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 diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index ebbef064b7..69598ad9f4 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,5 +1,9 @@ 2012-02-13 Lars Ingebrigtsen + * 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 diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 73f9b917e7..2cdb170315 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/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) @@ -1696,13 +1696,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) -- 2.20.1