master 5819fcb63b 2/2: Don't remove dummy.group from gnus-newsrc-alist on Gnus save

[Eric Abrahamsen]

branch: master
commit 5819fcb63b42a302a3b3588646cf3e043dc07a39
Author: Eric Abrahamsen <eric@ericabrahamsen.net>
Commit: Eric Abrahamsen <eric@ericabrahamsen.net>

    Don't remove dummy.group from gnus-newsrc-alist on Gnus save
    
    bug#53352
    
    * lisp/gnus/gnus-start.el (gnus-gnus-to-quick-newsrc-format): This
    function was removing dummy.group from the global value of
    `gnus-newsrc-alist' on save; we only wanted to remove it temporarily.
---
 lisp/gnus/gnus-start.el | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 2cf11fb12f..dd9c277805 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -2867,12 +2867,6 @@ SPECIFIC-VARIABLES, or those in `gnus-variable-list'."
       (princ "(setq gnus-newsrc-file-version ")
       (princ (gnus-prin1-to-string gnus-version))
       (princ ")\n"))
-    ;; Sort `gnus-newsrc-alist' according to order in
-    ;; `gnus-group-list'.
-    (setq gnus-newsrc-alist
-         (mapcar (lambda (g)
-                   (nth 1 (gethash g gnus-newsrc-hashtb)))
-                 (delete "dummy.group" gnus-group-list)))
     (let* ((print-quoted t)
            (print-escape-multibyte nil)
            (print-escape-nonascii t)
@@ -2891,17 +2885,20 @@ SPECIFIC-VARIABLES, or those in `gnus-variable-list'."
                  ;; Remove the `gnus-killed-list' from the list of variables
                  ;; to be saved, if required.
                  (delq 'gnus-killed-list (copy-sequence gnus-variable-list)))))
-          ;; Encode group names in `gnus-newsrc-alist' and
-          ;; `gnus-topic-alist' in order to keep newsrc.eld files
-          ;; compatible with older versions of Gnus.  At some point,
-          ;; if/when a new version of Gnus is released, stop doing
-          ;; this and move the corresponding decode in
-          ;; `gnus-read-newsrc-el-file' into a conversion routine.
+           ;; Sort `gnus-newsrc-alist' according to order in
+           ;; `gnus-group-list'.  Encode group names in
+           ;; `gnus-newsrc-alist' and `gnus-topic-alist' in order to
+           ;; keep newsrc.eld files compatible with older versions of
+           ;; Gnus.  At some point, if/when a new version of Gnus is
+           ;; released, stop doing this and move the corresponding
+           ;; decode in `gnus-read-newsrc-el-file' into a conversion
+           ;; routine.
           (gnus-newsrc-alist
-           (mapcar (lambda (info)
-                     (cons (encode-coding-string (car info) 'utf-8-emacs)
-                           (cdr info)))
-                   gnus-newsrc-alist))
+           (mapcar (lambda (group)
+                     (cons (encode-coding-string group 'utf-8-emacs)
+                           (cdadr (gethash group
+                           gnus-newsrc-hashtb))))
+                   (remove "dummy.group" gnus-group-list)))
           (gnus-topic-alist
            (when (memq 'gnus-topic-alist variables)
             (mapcar (lambda (elt)