aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Semyonov2024-07-02 01:42:26 +0300
committerEli Zaretskii2024-07-06 13:09:42 +0300
commit2fb6a98ecfa1579273a640e923f2e52f75e1f7ad (patch)
treeef4bf54e7f35c7c29d775525924c3087e6b932f3
parent74b82e6802e65ff0ec1ac3bbc680b5db9a7f1c89 (diff)
downloademacs-2fb6a98ecfa1579273a640e923f2e52f75e1f7ad.tar.gz
emacs-2fb6a98ecfa1579273a640e923f2e52f75e1f7ad.zip
nnfeed: (Mostly) fix group descriptions
* lisp/gnus/nnfeed.el (nnfeed--group-description): New function. (nnfeed-request-group-description, nnfeed-request-list-newsgroups): Use `nnfeed--group-description' and always return t if group data is found. (Bug#71888)
-rw-r--r--lisp/gnus/nnfeed.el16
1 files changed, 12 insertions, 4 deletions
diff --git a/lisp/gnus/nnfeed.el b/lisp/gnus/nnfeed.el
index d6963b2e929..2d33d4c813b 100644
--- a/lisp/gnus/nnfeed.el
+++ b/lisp/gnus/nnfeed.el
@@ -630,12 +630,21 @@ Only HEADERS of a type included in MIME are considered."
630(deffoo nnfeed-request-type (_group &optional _article) 630(deffoo nnfeed-request-type (_group &optional _article)
631 'unknown) 631 'unknown)
632 632
633;; FIXME: Works incorrectly when a group name contains spaces as Gnus actually
634;; separates the group name from the description with either a tab or a space.
635(defun nnfeed--group-description (name group)
636 "Return a description line for a GROUP called NAME."
637 (when-let ((desc (aref group 5))
638 ((not (string-blank-p desc))))
639 (insert name "\t" desc "\n")))
640
633(deffoo nnfeed-request-group-description (group &optional server) 641(deffoo nnfeed-request-group-description (group &optional server)
634 (when-let ((server (or server (nnfeed--current-server-no-prefix))) 642 (when-let ((server (or server (nnfeed--current-server-no-prefix)))
635 (g (nnfeed--group-data group server))) 643 (g (nnfeed--group-data group server)))
636 (with-current-buffer nntp-server-buffer 644 (with-current-buffer nntp-server-buffer
637 (erase-buffer) 645 (erase-buffer)
638 (insert group " " (aref g 5) "\n")))) 646 (nnfeed--group-description group g)
647 t)))
639 648
640(deffoo nnfeed-request-list-newsgroups (&optional server) 649(deffoo nnfeed-request-list-newsgroups (&optional server)
641 (when-let ((server (or server (nnfeed--current-server-no-prefix))) 650 (when-let ((server (or server (nnfeed--current-server-no-prefix)))
@@ -643,9 +652,8 @@ Only HEADERS of a type included in MIME are considered."
643 ((hash-table-p s))) 652 ((hash-table-p s)))
644 (with-current-buffer nntp-server-buffer 653 (with-current-buffer nntp-server-buffer
645 (erase-buffer) 654 (erase-buffer)
646 (maphash (lambda (group g) 655 (maphash #'nnfeed--group-description s)
647 (insert group " " (aref g 5) "\n")) 656 t)))
648 s))))
649 657
650(deffoo nnfeed-request-rename-group (group new-name &optional server) 658(deffoo nnfeed-request-rename-group (group new-name &optional server)
651 (when-let ((server (or server (nnfeed--current-server-no-prefix))) 659 (when-let ((server (or server (nnfeed--current-server-no-prefix)))