From a4b4e162a1f0f63f6c35854915f14a0d7fa3c0ac Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 11 Oct 2001 11:04:32 +0000 Subject: [PATCH] * gnus-start.el (gnus-re-read-newsrc-el-file): Use `gnus-ding-file-coding-system' instead of `gnus-startup-file-coding-system'; go to the beginning of the buffer before searching. (gnus-read-newsrc-el-file): Use `gnus-ding-file-coding-system' instead of `gnus-startup-file-coding-system'. --- ChangeLog | 9 +++++++++ lisp/gnus-start.el | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc6b8c5..f30045a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2001-10-11 Katsumi Yamaoka + + * lisp/gnus-start.el (gnus-re-read-newsrc-el-file): Use + `gnus-ding-file-coding-system' instead of + `gnus-startup-file-coding-system'; go to the beginning of the + buffer before searching. + (gnus-read-newsrc-el-file): Use `gnus-ding-file-coding-system' + instead of `gnus-startup-file-coding-system'. + 2001-10-10 Katsumi Yamaoka * lisp/message.el (message-send-news): Modify the value of diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el index a03b270..d8b32e7 100644 --- a/lisp/gnus-start.el +++ b/lisp/gnus-start.el @@ -2088,7 +2088,7 @@ If FORCE is non-nil, the .newsrc file is read." (error (ding) (or (not (or (zerop (buffer-size)) - (eq 'binary gnus-startup-file-coding-system) + (eq 'binary gnus-ding-file-coding-system) (gnus-re-read-newsrc-el-file ding-file))) (gnus-yes-or-no-p (format "Error in %s; continue? " ding-file)) @@ -2122,11 +2122,12 @@ The backup file \".newsrc.eld_\" will be created before re-reading." (error nil)) (progn (insert-file-contents-as-binary file nil nil nil 'replace) + (goto-char (point-min)) (when (re-search-forward "^[\t ]*([\t\n\r ]*setq[\t\n\r ]+gnus-format-specs" nil t) (delete-region (goto-char (match-beginning 0)) (forward-list 1)) (decode-coding-region (point-min) (point-max) - gnus-startup-file-coding-system) + gnus-ding-file-coding-system) (condition-case nil (progn (eval-region (point-min) (point-max)) -- 1.7.10.4