From c8aed865eb5085877f731243608c5746eaf3d9c2 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sun, 11 Sep 2011 00:40:54 +0200 Subject: [PATCH] (gnus-group-name-charset): Always return `utf-7' when decoding nnimap groups. --- lisp/ChangeLog | 3 +++ lisp/gnus-group.el | 6 ++++-- lisp/gnus-srvr.el | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3280df008..fcc228ddb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2011-09-10 Lars Magne Ingebrigtsen + * gnus-group.el (gnus-group-name-charset): Always return `utf-7' when + decoding nnimap groups. + * gnus.el (gnus-variable-list): Don't save `gnus-format-specs' in the newsrc file. It doesn't seem like an important optimisation any more. diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index bf83fd79a..4921fa3ea 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -1193,7 +1193,7 @@ The following commands are available: (unless (eq major-mode 'gnus-group-mode) (gnus-group-mode))) -(defun gnus-group-name-charset (method group) +(defun gnus-group-name-charset (method group &optional always-charset-p) (unless method (setq method (gnus-find-method-for-group group))) (when (stringp method) @@ -1201,7 +1201,9 @@ The following commands are available: (if (eq (car method) 'nnimap) ;; IMAP groups should not be encoded, since they do the encoding ;; in utf7 in the protocol. - nil + (if always-charset-p + 'utf-7 + nil) (let ((item (or (assoc method gnus-group-name-charset-method-alist) (and (consp method) (assoc (list (car method) (cadr method)) diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el index ec98b2ff7..7fcdb2014 100644 --- a/lisp/gnus-srvr.el +++ b/lisp/gnus-srvr.el @@ -860,7 +860,7 @@ claim them." name (mm-decode-coding-string name - (inline (gnus-group-name-charset method name))))))) + (inline (gnus-group-name-charset method name t))))))) (list 'gnus-group name) ))) (switch-to-buffer (current-buffer))) -- 2.25.1