Merge branch 'master' into comment-cachecomment-cache

1 files changed, 7 insertions, 2 deletions

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 47e33af96e8..be46339cd38 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -2801,8 +2801,13 @@ If FORCE is non-nil, the .newsrc file is read."
         (gnus-run-hooks 'gnus-save-newsrc-hook)
         (if gnus-slave
             (gnus-slave-save-newsrc)
-          ;; Save .newsrc.
-          (when gnus-save-newsrc-file
+          ;; Save .newsrc only if the select method is an NNTP method.
+          ;; The .newsrc file is for interoperability with other
+          ;; newsreaders, so saving non-NNTP groups there doesn't make
+          ;; much sense.
+          (when (and gnus-save-newsrc-file
+                     (eq (car (gnus-server-to-method gnus-select-method))
+                         'nntp))
             (gnus-message 8 "Saving %s..." gnus-current-startup-file)
             (gnus-gnus-to-newsrc-format)
             (gnus-message 8 "Saving %s...done" gnus-current-startup-file))