From: Basil L. Contovounesios Date: Thu, 11 Apr 2019 16:16:00 +0000 (+0100) Subject: Fix gnus-group-describe-all-groups (bug#35233) X-Git-Tag: emacs-27.0.90~3259^2~3 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c49f5d573b37f7aaa8d480d568c7e26d975f0320;p=emacs.git Fix gnus-group-describe-all-groups (bug#35233) This fixes oversights from 2018-04-26T16:26:27-07:00!eric@ericabrahamsen.net and 2016-02-13T18:45:11+11:00!larsi@gnus.org. * lisp/gnus/gnus-group.el (gnus-group-describe-all-groups): Insert group name and description instead of group name twice. Do not pass a hash-table to intern. Call sort with correct number of arguments. --- diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 0956dc46d05..b1e4091c975 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -4137,20 +4137,19 @@ If DONT-SCAN is non-nil, scan non-activated groups as well." (when (not (or gnus-description-hashtb (gnus-read-all-descriptions-files))) (error "Couldn't request descriptions file")) - (let ((buffer-read-only nil) - (groups (sort (hash-table-keys gnus-description-hashtb))) - b) + (let ((buffer-read-only nil)) (erase-buffer) - (dolist (group groups) - (setq b (point)) - (let ((charset (gnus-group-name-charset nil group))) + (dolist (group (sort (hash-table-keys gnus-description-hashtb) #'string<)) + (let ((b (point)) + (desc (gethash group gnus-description-hashtb)) + (charset (gnus-group-name-charset nil group))) (insert (format " *: %-20s %s\n" (gnus-group-name-decode group charset) - (gnus-group-name-decode group charset)))) - (add-text-properties - b (1+ b) (list 'gnus-group (intern group gnus-description-hashtb) - 'gnus-unread t 'gnus-marked nil - 'gnus-level (1+ gnus-level-subscribed)))) + (gnus-group-name-decode desc charset))) + (add-text-properties + b (1+ b) (list 'gnus-group group + 'gnus-unread t 'gnus-marked nil + 'gnus-level (1+ gnus-level-subscribed))))) (goto-char (point-min)) (gnus-group-position-point)))