From 980b429daebd18b1b480c3dd4476ea8676ac0eba Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 20 Dec 2004 01:37:44 +0000 Subject: [PATCH] Synch to No Gnus 200412200137. --- lisp/ChangeLog | 11 +++++++++++ lisp/gnus-agent.el | 6 ++++-- lisp/gnus-cache.el | 1 + lisp/gnus-group.el | 5 ++--- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 72463d9..17758a5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2004-12-20 Katsumi Yamaoka + + * gnus-agent.el (gnus-agent-group-path): Decode group name. + (gnus-agent-group-pathname): Ditto. + + * gnus-cache.el (gnus-cache-file-name): Decode group name. + + * gnus-group.el (gnus-group-make-group): Decode group name. + (gnus-group-make-rss-group): Register the group data after opening + the nnrss group. + 2004-12-17 Paul Jarc * nnmaildir.el (nnmaildir-request-expire-articles): Articles moved diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index e169ff0..dde79ca 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -1397,7 +1397,7 @@ downloaded into the agent." (nnheader-translate-file-chars (nnheader-replace-duplicate-chars-in-string (nnheader-replace-chars-in-string - (gnus-group-real-name group) + (gnus-group-real-name (gnus-group-decoded-name group)) ?/ ?_) ?. ?_))) (if (or nnmail-use-long-file-names @@ -1414,7 +1414,9 @@ downloaded into the agent." ;; while plugged. (let ((gnus-command-method (or gnus-command-method (gnus-find-method-for-group group)))) - (nnmail-group-pathname (gnus-group-real-name group) (gnus-agent-directory)))) + (nnmail-group-pathname (gnus-group-real-name + (gnus-group-decoded-name group)) + (gnus-agent-directory)))) (defun gnus-agent-get-function (method) (if (gnus-online method) diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el index f5a957a..a2ee72e 100644 --- a/lisp/gnus-cache.el +++ b/lisp/gnus-cache.el @@ -426,6 +426,7 @@ Returns the list of articles removed." (and (not unread) (not ticked) (not dormant) (memq 'read class)))) (defun gnus-cache-file-name (group article) + (setq group (gnus-group-decoded-name group)) (expand-file-name (if (stringp article) article (int-to-string article)) (file-name-as-directory diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index 28f3610..b22d616 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -2324,7 +2324,7 @@ ADDRESS." (nname (if method (gnus-group-prefixed-name name meth) name)) backend info) (when (gnus-group-entry nname) - (error "Group %s already exists" nname)) + (error "Group %s already exists" (gnus-group-decoded-name nname))) ;; Subscribe to the new group. (gnus-group-change-level (setq info (list t nname gnus-level-default-subscribed nil nil meth)) @@ -2681,12 +2681,11 @@ If there is, use Gnus to create an nnrss group" ;; Unify non-ASCII text. (setq title (mm-decode-coding-string (mm-encode-coding-string title 'utf-8) 'utf-8))) - (push (list title href desc) - nnrss-group-alist) (gnus-group-make-group (if encodable (mm-encode-coding-string title 'utf-8) title) '(nnrss "")) + (push (list title href desc) nnrss-group-alist) (nnrss-save-server-data nil)) (error "No feeds found for %s" url)))) -- 1.7.10.4