From 312ccbafb74ae1094227a41f6ae3c165f0c382eb Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 14 Dec 2004 12:00:07 +0000 Subject: [PATCH] Synch to No Gnus 200412141159. --- lisp/ChangeLog | 7 +++++++ lisp/gnus-group.el | 38 +++++++++++++++++++++----------------- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ece0547..ed4e56e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2004-12-14 Katsumi Yamaoka + + * gnus-group.el (gnus-group-delete-group): Decode group name. + (gnus-group-make-rss-group): Encode group name. + (gnus-group-catchup-current): Decode group name. + (gnus-group-kill-group): Decode group name. + 2004-12-08 Stefan Monnier * gnus-art.el (gnus-narrow-to-page): Don't hardcode point-min. diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index b49dd71..afb458c 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -2384,20 +2384,21 @@ be removed from the server, even when it's empty." (unless (gnus-check-backend-function 'request-delete-group group) (error "This back end does not support group deletion")) (prog1 - (if (and (not no-prompt) - (not (gnus-yes-or-no-p - (format - "Do you really want to delete %s%s? " - group (if force " and all its contents" ""))))) - () ; Whew! - (gnus-message 6 "Deleting group %s..." group) - (if (not (gnus-request-delete-group group force)) - (gnus-error 3 "Couldn't delete group %s" group) - (gnus-message 6 "Deleting group %s...done" group) - (gnus-group-goto-group group) - (gnus-group-kill-group 1 t) - (gnus-set-active group nil) - t)) + (let ((group-decoded (gnus-group-decoded-name group))) + (if (and (not no-prompt) + (not (gnus-yes-or-no-p + (format + "Do you really want to delete %s%s? " + group-decoded (if force " and all its contents" ""))))) + () ; Whew! + (gnus-message 6 "Deleting group %s..." group-decoded) + (if (not (gnus-request-delete-group group force)) + (gnus-error 3 "Couldn't delete group %s" group-decoded) + (gnus-message 6 "Deleting group %s...done" group-decoded) + (gnus-group-goto-group group) + (gnus-group-kill-group 1 t) + (gnus-set-active group nil) + t))) (gnus-group-position-point))) (defun gnus-group-rename-group (group new-name) @@ -2677,7 +2678,10 @@ If there is, use Gnus to create an nnrss group" (href (cdr (assoc 'href feedinfo)))) (push (list title href desc) nnrss-group-alist) - (gnus-group-make-group title '(nnrss "")) + (gnus-group-make-group (if (mm-coding-system-p 'utf-8) + (mm-encode-coding-string title 'utf-8) + title) + '(nnrss "")) (nnrss-save-server-data nil)) (error "No feeds found for %s" url)))) @@ -3180,7 +3184,7 @@ up is returned." "Do you really want to mark all articles in %s as read? " "Mark all unread articles in %s as read? ") (if (= (length groups) 1) - (car groups) + (gnus-group-decoded-name (car groups)) (format "these %d groups" (length groups))))))) n (while (setq group (pop groups)) @@ -3467,7 +3471,7 @@ of groups killed." gnus-list-of-killed-groups)) (gnus-group-change-level (if entry entry group) gnus-level-killed (if entry nil level)) - (message "Killed group %s" group)) + (message "Killed group %s" (gnus-group-decoded-name group))) ;; If there are lots and lots of groups to be killed, we use ;; this thing instead. (dolist (group (nreverse groups)) -- 1.7.10.4