aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Abrahamsen2022-01-24 16:24:10 -0800
committerAndreas Schwab2022-02-07 11:42:49 +0100
commit0d46ee2ddebb74a5a6e1d55da3641d1cd2ba5beb (patch)
tree66a926f5a6ca75b258fa76af74e9b90078ab1c04
parent821c240075e3b850a61207d18d520126292421ce (diff)
downloademacs-0d46ee2ddebb74a5a6e1d55da3641d1cd2ba5beb.tar.gz
emacs-0d46ee2ddebb74a5a6e1d55da3641d1cd2ba5beb.zip
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.
-rw-r--r--lisp/gnus/gnus-start.el29
1 files changed, 13 insertions, 16 deletions
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 0910df42edb..301120e4ee5 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -2868,12 +2868,6 @@ SPECIFIC-VARIABLES, or those in `gnus-variable-list'."
2868 (princ "(setq gnus-newsrc-file-version ") 2868 (princ "(setq gnus-newsrc-file-version ")
2869 (princ (gnus-prin1-to-string gnus-version)) 2869 (princ (gnus-prin1-to-string gnus-version))
2870 (princ ")\n")) 2870 (princ ")\n"))
2871 ;; Sort `gnus-newsrc-alist' according to order in
2872 ;; `gnus-group-list'.
2873 (setq gnus-newsrc-alist
2874 (mapcar (lambda (g)
2875 (nth 1 (gethash g gnus-newsrc-hashtb)))
2876 (delete "dummy.group" gnus-group-list)))
2877 (let* ((print-quoted t) 2871 (let* ((print-quoted t)
2878 (print-escape-multibyte nil) 2872 (print-escape-multibyte nil)
2879 (print-escape-nonascii t) 2873 (print-escape-nonascii t)
@@ -2892,17 +2886,20 @@ SPECIFIC-VARIABLES, or those in `gnus-variable-list'."
2892 ;; Remove the `gnus-killed-list' from the list of variables 2886 ;; Remove the `gnus-killed-list' from the list of variables
2893 ;; to be saved, if required. 2887 ;; to be saved, if required.
2894 (delq 'gnus-killed-list (copy-sequence gnus-variable-list))))) 2888 (delq 'gnus-killed-list (copy-sequence gnus-variable-list)))))
2895 ;; Encode group names in `gnus-newsrc-alist' and 2889 ;; Sort `gnus-newsrc-alist' according to order in
2896 ;; `gnus-topic-alist' in order to keep newsrc.eld files 2890 ;; `gnus-group-list'. Encode group names in
2897 ;; compatible with older versions of Gnus. At some point, 2891 ;; `gnus-newsrc-alist' and `gnus-topic-alist' in order to
2898 ;; if/when a new version of Gnus is released, stop doing 2892 ;; keep newsrc.eld files compatible with older versions of
2899 ;; this and move the corresponding decode in 2893 ;; Gnus. At some point, if/when a new version of Gnus is
2900 ;; `gnus-read-newsrc-el-file' into a conversion routine. 2894 ;; released, stop doing this and move the corresponding
2895 ;; decode in `gnus-read-newsrc-el-file' into a conversion
2896 ;; routine.
2901 (gnus-newsrc-alist 2897 (gnus-newsrc-alist
2902 (mapcar (lambda (info) 2898 (mapcar (lambda (group)
2903 (cons (encode-coding-string (car info) 'utf-8-emacs) 2899 (cons (encode-coding-string group 'utf-8-emacs)
2904 (cdr info))) 2900 (cdadr (gethash group
2905 gnus-newsrc-alist)) 2901 gnus-newsrc-hashtb))))
2902 (remove "dummy.group" gnus-group-list)))
2906 (gnus-topic-alist 2903 (gnus-topic-alist
2907 (when (memq 'gnus-topic-alist variables) 2904 (when (memq 'gnus-topic-alist variables)
2908 (mapcar (lambda (elt) 2905 (mapcar (lambda (elt)