From: yamaoka Date: Wed, 26 Apr 2000 23:24:11 +0000 (+0000) Subject: Sync. X-Git-Tag: t-gnus-6_14-quimby-before-AC-changed-~100 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d32fb5216891588b56776ef77dea5e65e68d1e71;p=elisp%2Fgnus.git- Sync. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 703a193..08d12a9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,26 @@ +2000-04-26 Florian Weimer + + * mm-bodies.el (mm-encode-body): Remove reference to + mm-default-charset in comment. + +2000-04-24 00:56:00 Björn Torkelsson + + * rfc2047.el (rfc2047-encode-message-header): Fixing typo. + +2000-04-26 12:27:41 Shenghuo ZHU + + * gnus-draft.el (gnus-draft-send): Move gnus-draft-setup inside of + let. + +2000-04-26 12:26:10 Pavel Janik ml. + + * gnus-draft.el (gnus-draft-setup): Fix comments. + +2000-04-26 10:06:12 Shenghuo ZHU + + * nnmbox.el (nnmbox-create-mbox): Use nnmbox-file-coding-system, + if nnmbox-file-coding-system-for-write is nil. + 2000-04-26 02:17:44 Shenghuo ZHU * gnus-msg.el (gnus-configure-posting-styles): Just remove the diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el index 7a12263..7dba250 100644 --- a/lisp/gnus-draft.el +++ b/lisp/gnus-draft.el @@ -122,7 +122,6 @@ (defun gnus-draft-send (article &optional group interactive) "Send message ARTICLE." - (gnus-draft-setup-for-sending article (or group "nndraft:queue")) (let ((message-syntax-checks (if interactive nil 'dont-check-for-anything-just-trust-me)) (message-inhibit-body-encoding (or (not group) @@ -130,8 +129,10 @@ message-inhibit-body-encoding)) (message-send-hook (and group (not (equal group "nndraft:queue")) message-send-hook)) - (message-setup-hook nil) + (message-setup-hook (and group (not (equal group "nndraft:queue")) + message-setup-hook)) type method) + (gnus-draft-setup-for-sending article (or group "nndraft:queue")) ;; We read the meta-information that says how and where ;; this message is to be sent. (save-restriction @@ -212,8 +213,8 @@ (erase-buffer) (if (not (gnus-request-restore-buffer article group)) (error "Couldn't restore the article") - ;; Insert the separator. (funcall gnus-draft-decoding-function) + ;; Insert the separator. (goto-char (point-min)) (search-forward "\n\n") (forward-char -1) diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el index 3a545d3..74870e2 100644 --- a/lisp/mm-bodies.el +++ b/lisp/mm-bodies.el @@ -60,7 +60,7 @@ If successful, the MIME charset is returned. If no encoding was done, nil is returned." (if (not (featurep 'mule)) ;; In the non-Mule case, we search for non-ASCII chars and - ;; return the value of `mm-default-charset' if any are found. + ;; return the value of `mail-parse-charset' if any are found. (save-excursion (goto-char (point-min)) (if (re-search-forward "[^\x0-\x7f]" nil t) diff --git a/lisp/mml.el b/lisp/mml.el index 188fc50..1406563 100644 --- a/lisp/mml.el +++ b/lisp/mml.el @@ -27,6 +27,7 @@ (require 'mm-bodies) (require 'mm-encode) (require 'mm-decode) +(eval-when-compile 'cl) (eval-and-compile (autoload 'message-make-message-id "message") @@ -629,8 +630,7 @@ one charsets.") 'list (mm-delete-duplicates (nconc - (mapcar (lambda (m) (cdr m)) - mailcap-mime-extensions) + (mapcar 'cdr mailcap-mime-extensions) (apply 'nconc (mapcar diff --git a/lisp/nnmbox.el b/lisp/nnmbox.el index 4eae3b8..3deac05 100644 --- a/lisp/nnmbox.el +++ b/lisp/nnmbox.el @@ -529,7 +529,8 @@ (defun nnmbox-create-mbox () (when (not (file-exists-p nnmbox-mbox-file)) (let ((nnmail-file-coding-system - nnmbox-file-coding-system-for-write)) + (or nnmbox-file-coding-system-for-write + nnmbox-file-coding-system))) (nnmail-write-region 1 1 nnmbox-mbox-file t 'nomesg)))) (defun nnmbox-read-mbox () diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el index 52bd83e..fd8ed22 100644 --- a/lisp/rfc2047.el +++ b/lisp/rfc2047.el @@ -128,7 +128,7 @@ Should be called narrowed to the head of the message." (t))) (goto-char (point-max))))) (when mail-parse-charset - (encode-coding-region + (mm-encode-coding-region (point-min) (point-max) mail-parse-charset)))) (defun rfc2047-encodable-p (&optional header) diff --git a/lisp/webmail.el b/lisp/webmail.el index d7eb667..bc33f3a 100644 --- a/lisp/webmail.el +++ b/lisp/webmail.el @@ -23,6 +23,9 @@ ;;; Commentary: +;; Note: Now mail.yahoo.com provides POP3 service, the webmail +;; fetching is not going to be supported. + ;; Note: You need to have `url' and `w3' installed for this backend to ;; work. `w3' must be 4.0pre46+one-line-cookie patch or standalone ;; `url'. diff --git a/texi/ChangeLog b/texi/ChangeLog index 95f0434..60cae69 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,10 @@ +2000-04-26 Florian Weimer + + * message.texi (Various Message Variables): Document + message-default-charset. + + * emacs-mime.texi (Charset Translation): New section. + 2000-04-26 02:30:06 Shenghuo ZHU * gnus.texi (Posting Styles): Addition. diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi index 82afa01..efda9aa 100644 --- a/texi/emacs-mime.texi +++ b/texi/emacs-mime.texi @@ -960,6 +960,7 @@ string containing the @sc{mime} message. * Simple MML Example:: An example MML document. * MML Definition:: All valid MML elements. * Advanced MML Example:: Another example MML document. +* Charset Translation:: How charsets are mapped from @sc{mule} to MIME. * Conversion:: Going from @sc{mime} to MML and vice versa. @end menu @@ -1181,6 +1182,43 @@ This plain text part is an attachment. --=-=-=-- @end example +@node Charset Translation +@section Charset Translation +@cindex charsets + +During translation from MML to @sc{mime}, for each @sc{mime} part which +has been composed inside Emacs, an appropriate charset has to be chosen. + +@vindex mail-parse-charset +If you are running a non-@sc{mule} Emacs, this process is simple: If the +part contains any non-ASCII (8-bit) characters, the @sc{mime} charset +given by @code{mail-parse-charset} (a symbol) is used. (Never set this +variable directly, though. If you want to change the default charset, +please consult the documentation of the package which you use to process +@sc{mime} messages. +@xref{Various Message Variables, , Various Message Variables, message, + Message Manual}, for example.) +If there are only ASCII characters, the @sc{mime} charset US-ASCII is +used, of course. + +@cindex MULE +@cindex UTF-8 +@cindex Unicode +@vindex mm-mime-mule-charset-alist +Things are slightly more complicated when running Emacs with @sc{mule} +support. In this case, a list of the @sc{mule} charsets used in the +part is obtained, and the @sc{mule} charsets are translated to @sc{mime} +charsets by consulting the variable @code{mm-mime-mule-charset-alist}. +If this results in a single @sc{mime} charset, this is used to encode +the part. But if the resulting list of @sc{mime} charsets contains more +than one element, two things can happen: If it is possible to encode the +part via UTF-8, this charset is used. (For this, Emacs must support +the @code{utf-8} coding system, and the part must consist entirely of +characters which have Unicode counterparts.) If UTF-8 is not available +for some reason, the part is split into several ones, so that each one +can be encoded with a single @sc{mime} charset. The part can only be +split at line boundaries, though---if more than one @sc{mime} charset is +required to encode a single line, it is not possible to encode the part. @node Conversion @section Conversion diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index b052eb3..1065e16 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -10760,12 +10760,14 @@ IMAP $(B%a!<%k%=!<%9$NNc(B: @end lisp @item webmail -www.hotmail.com, mail.yahoo.com, www.netaddress.com, www.my-deja.com -$(B$J$I$N%&%'%V%a!<%k%5!<%P!<$+$i%a!<%k$rl9g(B +$(B$O(B "one-line-cookie" $(B%Q%C%A$rEv$F$kI,MW$,$"$j$^$9!#(B $(B7Y9p(B: $(B%a!<%k$,<:$o$l$k$+$b$7$l$^$;$s!#L5J]>Z$G$9!#(B @@ -10774,7 +10776,7 @@ www.hotmail.com, mail.yahoo.com, www.netaddress.com, www.my-deja.com @table @code @item :subtype $(B%&%'%V%a!<%k%5!<%P!<$N7?$G$9!#=i4|CM$O(B @code{hotmail} $(B$G$9!#B>$N8uJd$O(B -@code{yahoo}, @code{netaddress}, @code{my-deja} $(B$G$9!#(B +@code{netscape}, @code{netaddress}, @code{my-deja} $(B$G$9!#(B @item :user $(B%&%'%V%a!<%k%5!<%P!<$NMxMQ$G$9!#=i4|CM$O%m%0%$%sL>$G$9!#(B @@ -10792,7 +10794,7 @@ www.hotmail.com, mail.yahoo.com, www.netaddress.com, www.my-deja.com $(B%&%'%V%a!<%k$N%=!<%9$NNc$G$9(B: @lisp -(webmail :subtype 'yahoo :user "user-name" :password "secret") +(webmail :subtype 'hotmail :user "user-name" :password "secret") @end lisp @end table diff --git a/texi/gnus.texi b/texi/gnus.texi index 44730e6..5cb82f5 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -11177,11 +11177,14 @@ An example @sc{imap} mail source: @end lisp @item webmail -Get mail from a webmail server, such as www.hotmail.com, -mail.yahoo.com, www.netaddress.com and www.my-deja.com. +Get mail from a webmail server, such as www.hotmail.com, +webmail.netscape.com, www.netaddress.com, www.my-deja.com. -NOTE: Webmail largely depends on w3 (url) package, whose version of "WWW -4.0pre.46 1999/10/01" or previous ones may not work. +NOTE: Now mail.yahoo.com provides POP3 service, so @sc{pop} mail source +is suggested. + +NOTE: Webmail largely depends cookies. A "one-line-cookie" patch is +required for url "4.0pre.46". WARNING: Mails may lost. NO WARRANTY. @@ -11190,7 +11193,7 @@ Keywords: @table @code @item :subtype The type of the webmail server. The default is @code{hotmail}. The -alternatives are @code{yahoo}, @code{netaddress}, @code{my-deja}. +alternatives are @code{netscape}, @code{netaddress}, @code{my-deja}. @item :user The user name to give to the webmail server. The default is the login @@ -11209,7 +11212,7 @@ folder after finishing the fetch. An example webmail source: @lisp -(webmail :subtype 'yahoo :user "user-name" :password "secret") +(webmail :subtype 'hotmail :user "user-name" :password "secret") @end lisp @end table diff --git a/texi/message-ja.texi b/texi/message-ja.texi index 65afc47..8f551d7 100644 --- a/texi/message-ja.texi +++ b/texi/message-ja.texi @@ -1021,6 +1021,17 @@ qualified domain name (FQDN) ($B40A4$K>r7o$rK~$?$7$?%I%a%$%sL>(B) $B$G$J$$$J$ @section $B$$$m$$$m$J%a%C%;!<%8JQ?t(B @table @code +@c @item message-default-charset +@c @vindex message-default-charset +@c @cindex charset +@c Symbol naming a @sc{mime} charset. Non-ASCII characters in messages are +@c assumed to be encoded using this charset. The default is @code{nil}, +@c which means ask the user. (This variable is used only on non-@sc{mule} +@c Emacsen. +@c @xref{Charset Translation, , Charset Translation, emacs-mime, +@c Emacs MIME Manual}, for details on the @sc{mule}-to-@sc{mime} +@c translation process. +@c @item message-signature-separator @vindex message-signature-separator $B=pL>J,N%$K9gCW$9$k@55,I=8=$G$9!#=i4|CM$O(B @samp{^-- *$} $B$G$9!#(B diff --git a/texi/message.texi b/texi/message.texi index 0bbbc50..cb756a3 100644 --- a/texi/message.texi +++ b/texi/message.texi @@ -1046,6 +1046,17 @@ posting a prepared news message. @section Various Message Variables @table @code +@item message-default-charset +@vindex message-default-charset +@cindex charset +Symbol naming a @sc{mime} charset. Non-ASCII characters in messages are +assumed to be encoded using this charset. The default is @code{nil}, +which means ask the user. (This variable is used only on non-@sc{mule} +Emacsen. +@xref{Charset Translation, , Charset Translation, emacs-mime, + Emacs MIME Manual}, for details on the @sc{mule}-to-@sc{mime} +translation process. + @item message-signature-separator @vindex message-signature-separator Regexp matching the signature separator. It is @samp{^-- *$} by