aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBasil L. Contovounesios2019-04-11 17:16:00 +0100
committerBasil L. Contovounesios2019-04-14 01:58:47 +0100
commitc49f5d573b37f7aaa8d480d568c7e26d975f0320 (patch)
treed37bee68f8cce12aa853f0186d3f574106924cff
parent7308c2edfbd600e19685bf2cde099e46be3398c8 (diff)
downloademacs-c49f5d573b37f7aaa8d480d568c7e26d975f0320.tar.gz
emacs-c49f5d573b37f7aaa8d480d568c7e26d975f0320.zip
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.
-rw-r--r--lisp/gnus/gnus-group.el21
1 files changed, 10 insertions, 11 deletions
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."
4137 (when (not (or gnus-description-hashtb 4137 (when (not (or gnus-description-hashtb
4138 (gnus-read-all-descriptions-files))) 4138 (gnus-read-all-descriptions-files)))
4139 (error "Couldn't request descriptions file")) 4139 (error "Couldn't request descriptions file"))
4140 (let ((buffer-read-only nil) 4140 (let ((buffer-read-only nil))
4141 (groups (sort (hash-table-keys gnus-description-hashtb)))
4142 b)
4143 (erase-buffer) 4141 (erase-buffer)
4144 (dolist (group groups) 4142 (dolist (group (sort (hash-table-keys gnus-description-hashtb) #'string<))
4145 (setq b (point)) 4143 (let ((b (point))
4146 (let ((charset (gnus-group-name-charset nil group))) 4144 (desc (gethash group gnus-description-hashtb))
4145 (charset (gnus-group-name-charset nil group)))
4147 (insert (format " *: %-20s %s\n" 4146 (insert (format " *: %-20s %s\n"
4148 (gnus-group-name-decode group charset) 4147 (gnus-group-name-decode group charset)
4149 (gnus-group-name-decode group charset)))) 4148 (gnus-group-name-decode desc charset)))
4150 (add-text-properties 4149 (add-text-properties
4151 b (1+ b) (list 'gnus-group (intern group gnus-description-hashtb) 4150 b (1+ b) (list 'gnus-group group
4152 'gnus-unread t 'gnus-marked nil 4151 'gnus-unread t 'gnus-marked nil
4153 'gnus-level (1+ gnus-level-subscribed)))) 4152 'gnus-level (1+ gnus-level-subscribed)))))
4154 (goto-char (point-min)) 4153 (goto-char (point-min))
4155 (gnus-group-position-point))) 4154 (gnus-group-position-point)))
4156 4155