summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2017-01-25 19:30:22 +0100
committerLars Ingebrigtsen <larsi@gnus.org>2017-01-25 19:30:22 +0100
commit544b996915b9a06050b1a80c690749649dacb9d3 (patch)
tree8dd2ee2cb104176a9c99bd291d3719c3b825fb03
parent7a7c0b170b9567e892a1bf9a03d8f447f67b0e50 (diff)
downloademacs-544b996915b9a06050b1a80c690749649dacb9d3.tar.gz
Only save .newsrc file if the native method is NNTP
* lisp/gnus/gnus-start.el (gnus-save-newsrc-file): Only save the .newsrc file if the native select method is NNTP (bug#18198). This avoids problems with invalid IMAP group names and the like in the .newsrc file.
-rw-r--r--lisp/gnus/gnus-start.el9
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))