From ba775afe0d3ba12dbb7ff94b6be0bbed9285e9d9 Mon Sep 17 00:00:00 2001 From: Gnus developers Date: Mon, 30 Jan 2012 23:30:22 +0000 Subject: [PATCH] Merge changes made in Gnus trunk gnus.texi (Agent Basics): Fix outdated description of `gnus-agent-auto-agentize-methods'. rfc2047.el (rfc2047-encode-region): Allow not folding the encoded words. (rfc2047-encode-string): Ditto. (rfc2047-encode-parameter): Don't fold parameters. Some MUAs do not understand folded filename="..." parameters, for instance. gnus-agent.el (gnus-agent-auto-agentize-methods): Point to the Agent section in the manual. --- doc/misc/gnus.texi | 5 ++--- lisp/gnus/ChangeLog | 11 +++++++++++ lisp/gnus/gnus-agent.el | 2 +- lisp/gnus/rfc2047.el | 11 ++++++----- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 7728041c83b..1883975b7f6 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -18236,8 +18236,7 @@ Agent. Go to the server buffer (@kbd{^} in the group buffer) and press @kbd{J a} on the server (or servers) that you wish to have covered by the Agent (@pxref{Server Agent Commands}), or @kbd{J r} on automatically added servers you do not wish to have covered by the Agent. By default, -all @code{nntp} and @code{nnimap} servers in @code{gnus-select-method} and -@code{gnus-secondary-select-methods} are agentized. +no servers are agentized. @item Decide on download policy. It's fairly simple once you decide whether @@ -19263,7 +19262,7 @@ to agentize remote back ends. The auto-agentizing has the same effect as running @kbd{J a} on the servers (@pxref{Server Agent Commands}). If the file exist, you must manage the servers manually by adding or removing them, this variable is only applicable the first time you -start Gnus. The default is @samp{(nntp nnimap)}. +start Gnus. The default is @samp{nil}. @end table diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 93ceeebf0c1..1d99418ed21 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,5 +1,16 @@ +2012-01-30 Philipp Haselwarter (tiny change) + + * gnus-agent.el (gnus-agent-auto-agentize-methods): Point to the Agent + section in the manual. + 2012-01-30 Lars Ingebrigtsen + * rfc2047.el (rfc2047-encode-region): Allow not folding the encoded + words. + (rfc2047-encode-string): Ditto. + (rfc2047-encode-parameter): Don't fold parameters. Some MUAs do not + understand folded filename="..." parameters, for instance. + * nnimap.el (nnimap-wait-for-response): Include the imap server name in the message for greater debuggability. diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el index 70772bb1d0d..d7308758862 100644 --- a/lisp/gnus/gnus-agent.el +++ b/lisp/gnus/gnus-agent.el @@ -186,7 +186,7 @@ When found, offer to remove them." (defcustom gnus-agent-auto-agentize-methods nil "Initially, all servers from these methods are agentized. The user may remove or add servers using the Server buffer. -See Info node `(gnus)Server Buffer'." +See Info nodes `(gnus)Server Buffer', `(gnus)Agent Variables'." :version "22.1" :type '(repeat symbol) :group 'gnus-agent) diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el index a275df7701b..e881256f386 100644 --- a/lisp/gnus/rfc2047.el +++ b/lisp/gnus/rfc2047.el @@ -362,7 +362,7 @@ The buffer may be narrowed." (modify-syntax-entry ?@ "." table) table)) -(defun rfc2047-encode-region (b e) +(defun rfc2047-encode-region (b e &optional dont-fold) "Encode words in region B to E that need encoding. By default, the region is treated as containing RFC2822 addresses. Dynamically bind `rfc2047-encoding-type' to change that." @@ -546,16 +546,17 @@ Dynamically bind `rfc2047-encoding-type' to change that." (signal (car err) (cdr err)) (error "Invalid data for rfc2047 encoding: %s" (mm-replace-in-string orig-text "[ \t\n]+" " ")))))))) - (rfc2047-fold-region b (point)) + (unless dont-fold + (rfc2047-fold-region b (point))) (goto-char (point-max)))) -(defun rfc2047-encode-string (string) +(defun rfc2047-encode-string (string &optional dont-fold) "Encode words in STRING. By default, the string is treated as containing addresses (see `rfc2047-encoding-type')." (mm-with-multibyte-buffer (insert string) - (rfc2047-encode-region (point-min) (point-max)) + (rfc2047-encode-region (point-min) (point-max) dont-fold) (buffer-string))) ;; From RFC 2047: @@ -850,7 +851,7 @@ This is a substitution for the `rfc2231-encode-string' function, that is the standard but many mailers don't support it." (let ((rfc2047-encoding-type 'mime) (rfc2047-encode-max-chars nil)) - (rfc2045-encode-string param (rfc2047-encode-string value)))) + (rfc2045-encode-string param (rfc2047-encode-string value t)))) ;;; ;;; Functions for decoding RFC2047 messages -- 2.39.2