aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-08-01 10:46:23 +0000
committerGerd Moellmann2001-08-01 10:46:23 +0000
commit2d2820a4386c319af48bc3d47ae05729285c3b9d (patch)
tree2ce1f8a7d7c40776ba6c5a89b7b4258df874a48d
parent5bb97b2621a69dae20b74b6966b19aa7fd910982 (diff)
downloademacs-2d2820a4386c319af48bc3d47ae05729285c3b9d.tar.gz
emacs-2d2820a4386c319af48bc3d47ae05729285c3b9d.zip
(gnus-startup-file-coding-system): Revert to binary.
(gnus-ding-file-coding-system): New variable. (gnus-read-newsrc-el-file, gnus-save-newsrc-file) (gnus-slave-save-newsrc): Use it.
-rw-r--r--lisp/gnus/gnus-start.el13
1 files changed, 8 insertions, 5 deletions
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 031f02f6a13..d70124879cd 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -393,10 +393,13 @@ Can be used to turn version control on or off."
393 :group 'gnus-newsrc 393 :group 'gnus-newsrc
394 :type 'boolean) 394 :type 'boolean)
395 395
396(defvar gnus-startup-file-coding-system 'emacs-mule 396;;; Internal variables
397
398(defvar gnus-startup-file-coding-system 'binary
397 "*Coding system for startup file.") 399 "*Coding system for startup file.")
398 400
399;;; Internal variables 401(defvar gnus-ding-file-coding-system 'emacs-mule
402 "*Coding system for ding file.")
400 403
401(defvar gnus-newsrc-file-version nil) 404(defvar gnus-newsrc-file-version nil)
402(defvar gnus-override-subscribe-method nil) 405(defvar gnus-override-subscribe-method nil)
@@ -2021,7 +2024,7 @@ If FORCE is non-nil, the .newsrc file is read."
2021 (gnus-message 5 "Reading %s..." ding-file) 2024 (gnus-message 5 "Reading %s..." ding-file)
2022 (let (gnus-newsrc-assoc) 2025 (let (gnus-newsrc-assoc)
2023 (condition-case nil 2026 (condition-case nil
2024 (let ((coding-system-for-read gnus-startup-file-coding-system)) 2027 (let ((coding-system-for-read gnus-ding-file-coding-system))
2025 (load ding-file t t t)) 2028 (load ding-file t t t))
2026 (error 2029 (error
2027 (ding) 2030 (ding)
@@ -2383,7 +2386,7 @@ If FORCE is non-nil, the .newsrc file is read."
2383 (gnus-message 5 "Saving %s.eld..." gnus-current-startup-file) 2386 (gnus-message 5 "Saving %s.eld..." gnus-current-startup-file)
2384 (gnus-gnus-to-quick-newsrc-format) 2387 (gnus-gnus-to-quick-newsrc-format)
2385 (gnus-run-hooks 'gnus-save-quick-newsrc-hook) 2388 (gnus-run-hooks 'gnus-save-quick-newsrc-hook)
2386 (let ((coding-system-for-write gnus-startup-file-coding-system)) 2389 (let ((coding-system-for-write gnus-ding-file-coding-system))
2387 (save-buffer)) 2390 (save-buffer))
2388 (kill-buffer (current-buffer)) 2391 (kill-buffer (current-buffer))
2389 (gnus-message 2392 (gnus-message
@@ -2509,7 +2512,7 @@ If FORCE is non-nil, the .newsrc file is read."
2509 (make-temp-name (concat gnus-current-startup-file "-slave-"))) 2512 (make-temp-name (concat gnus-current-startup-file "-slave-")))
2510 (modes (ignore-errors 2513 (modes (ignore-errors
2511 (file-modes (concat gnus-current-startup-file ".eld"))))) 2514 (file-modes (concat gnus-current-startup-file ".eld")))))
2512 (let ((coding-system-for-write gnus-startup-file-coding-system)) 2515 (let ((coding-system-for-write gnus-ding-file-coding-system))
2513 (gnus-write-buffer slave-name)) 2516 (gnus-write-buffer slave-name))
2514 (when modes 2517 (when modes
2515 (set-file-modes slave-name modes))))) 2518 (set-file-modes slave-name modes)))))