(gnus-read-newsrc-el-file): Don't bind

coding-system-for-read.
(gnus-gnus-to-quick-newsrc-format): Insert coding cookie.

1 files changed, 5 insertions, 3 deletions

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 69ff17b4d7f..4b3e1135440 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -395,6 +395,8 @@ Can be used to turn version control on or off."
 
 ;;; Internal variables
 
+;; Fixme: deal with old emacs-mule when mm-universal-coding-system is
+;; utf-8-emacs.
 (defvar gnus-ding-file-coding-system mm-universal-coding-system
   "Coding system for ding file.")
 
@@ -2015,8 +2017,7 @@ If FORCE is non-nil, the .newsrc file is read."
     (gnus-message 5 "Reading %s..." ding-file)
     (let (gnus-newsrc-assoc)
       (condition-case nil
-          (let ((coding-system-for-read gnus-ding-file-coding-system))
-            (load ding-file t t t))
+          (load ding-file t t t)
         (error
          (ding)
          (unless (gnus-yes-or-no-p
@@ -2390,7 +2391,8 @@ If FORCE is non-nil, the .newsrc file is read."
   (let ((print-quoted t)
         (print-escape-newlines t))
 
-    (insert ";; -*- emacs-lisp -*-\n")
+    (insert ";; -*- emacs-lisp; coding: "
+            (format "%s" gnus-ding-file-coding-system) ";-*-\n")
     (insert ";; Gnus startup file.\n")
     (insert "\
 ;; Never delete this file -- if you want to force Gnus to read the