From ebf947c2b931f7ecaf594f174a3f217197f50f95 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 25 Jan 2001 00:59:32 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 9 +++++++++ lisp/nntp.el | 2 +- lisp/rfc2047.el | 7 +++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f783737..3db2631 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2001-01-24 19:00:00 ShengHuo ZHU + + * nntp.el (nntp-open-connection): 201 is possible. + +2001-01-24 18:00:00 ShengHuo ZHU + + * rfc2047.el (rfc2047-encode): MIME charset is not coding system. + (rfc2047-charset-encoding-alist): Add big5. + 2001-01-24 17:00:00 ShengHuo ZHU * gnus-agent.el (gnus-agent-add-server): Redraw the line. diff --git a/lisp/nntp.el b/lisp/nntp.el index 140bc5b..a1ea1e7 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -984,7 +984,7 @@ password contained in '~/.nntp-authinfo'." (when (and (buffer-name pbuffer) process) (process-kill-without-query process) - (if (and (nntp-wait-for process "^200.*\n" buffer nil t) + (if (and (nntp-wait-for process "^2.*\n" buffer nil t) (memq (process-status process) '(open run))) (prog1 (caar (push (list process buffer nil) nntp-connection-alist)) diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el index d744b3d..3aa36fd 100644 --- a/lisp/rfc2047.el +++ b/lisp/rfc2047.el @@ -73,6 +73,8 @@ The values can be: (iso-2022-jp . B) (iso-2022-kr . B) (gb2312 . B) + (big5 . B) + (cn-big5 . B) (cn-gb . B) (cn-gb-2312 . B) (euc-kr . B) @@ -277,6 +279,7 @@ The buffer may be narrowed." (defun rfc2047-encode (b e charset) "Encode the word in the region B to E with CHARSET." (let* ((mime-charset (mm-mime-charset charset)) + (cs (mm-charset-to-coding-system mime-charset)) (encoding (or (cdr (assq mime-charset rfc2047-charset-encoding-alist)) 'B)) @@ -294,8 +297,8 @@ The buffer may be narrowed." (unless (eobp) (insert "\n")))) (if (and (mm-multibyte-p) - (mm-coding-system-p mime-charset)) - (mm-encode-coding-region (point-min) (point-max) mime-charset)) + (mm-coding-system-p cs)) + (mm-encode-coding-region (point-min) (point-max) cs)) (funcall (cdr (assq encoding rfc2047-encoding-function-alist)) (point-min) (point-max)) (goto-char (point-min)) -- 1.7.10.4