annotate lisp/gnus/rfc2047.el @ 106175:d4ca58110155

* PROBLEMS: Remove fixed rebasing problem.
author Chong Yidong <cyd@stupidchicken.com>
date Fri, 20 Nov 2009 21:46:28 +0000
parents fc3c7104330d
children 1d1d5d9bd884
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38413
a26d9b55abb6 Some fixes to follow coding conventions in files from Gnus.
Pavel Janík <Pavel@Janik.cz>
parents: 35985
diff changeset
1 ;;; rfc2047.el --- functions for encoding and decoding rfc2047 messages
60161
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
2
104830
79c2323377ac Use default-value rather than default-enable-multibyte-characters.
Glenn Morris <rgm@gnu.org>
parents: 103027
diff changeset
3 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
79c2323377ac Use default-value rather than default-enable-multibyte-characters.
Glenn Morris <rgm@gnu.org>
parents: 103027
diff changeset
4 ;; 2007, 2008, 2009 Free Software Foundation, Inc.
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
5
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
6 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
7 ;; MORIOKA Tomohiko <morioka@jaist.ac.jp>
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
8 ;; This file is part of GNU Emacs.
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
9
94662
f42ef85caf91 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 92777
diff changeset
10 ;; GNU Emacs is free software: you can redistribute it and/or modify
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
11 ;; it under the terms of the GNU General Public License as published by
94662
f42ef85caf91 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 92777
diff changeset
12 ;; the Free Software Foundation, either version 3 of the License, or
f42ef85caf91 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 92777
diff changeset
13 ;; (at your option) any later version.
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
14
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
94662
f42ef85caf91 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 92777
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
18 ;; GNU General Public License for more details.
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
19
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
94662
f42ef85caf91 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 92777
diff changeset
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
22
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
23 ;;; Commentary:
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
24
34674
79dde983f45b Add some commentary.
Dave Love <fx@gnu.org>
parents: 33815
diff changeset
25 ;; RFC 2047 is "MIME (Multipurpose Internet Mail Extensions) Part
79dde983f45b Add some commentary.
Dave Love <fx@gnu.org>
parents: 33815
diff changeset
26 ;; Three: Message Header Extensions for Non-ASCII Text".
79dde983f45b Add some commentary.
Dave Love <fx@gnu.org>
parents: 33815
diff changeset
27
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
28 ;;; Code:
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
29
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
30 (eval-when-compile
86154
1cdfc94602cb * smime.el (from):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85712
diff changeset
31 (require 'cl))
1cdfc94602cb * smime.el (from):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85712
diff changeset
32 (defvar message-posting-charset)
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
33
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
34 (require 'qp)
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
35 (require 'mm-util)
60161
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
36 (require 'ietf-drums)
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
37 ;; Fixme: Avoid this (used for mail-parse-charset) mm dependence on gnus.
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
38 (require 'mail-prsvr)
78125
f0705c4da65a Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 75347
diff changeset
39 (require 'rfc2045) ;; rfc2045-encode-string
33304
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
40 (autoload 'mm-body-7-or-8 "mm-bodies")
33127
eca95f9d7f05 (base64): Require unconditionally.
Dave Love <fx@gnu.org>
parents: 31764
diff changeset
41
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
42 (defvar rfc2047-header-encoding-alist
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
43 '(("Newsgroups" . nil)
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
44 ("Followup-To" . nil)
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
45 ("Message-ID" . nil)
58835
9bdd97960431 Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Miles Bader <miles@gnu.org>
parents: 57243
diff changeset
46 ("\\(Resent-\\)?\\(From\\|Cc\\|To\\|Bcc\\|\\(In-\\)?Reply-To\\|Sender\
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
47 \\|Mail-Followup-To\\|Mail-Copies-To\\|Approved\\)" . address-mime)
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
48 (t . mime))
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
49 "*Header/encoding method alist.
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
50 The list is traversed sequentially. The keys can either be
33304
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
51 header regexps or t.
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
52
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
53 The values can be:
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
54
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
55 1) nil, in which case no encoding is done;
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
56 2) `mime', in which case the header will be encoded according to RFC2047;
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
57 3) `address-mime', like `mime', but takes account of the rules for address
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
58 fields (where quoted strings and comments must be treated separately);
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
59 4) a charset, in which case it will be encoded as that charset;
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
60 5) `default', in which case the field will be encoded as the rest
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
61 of the article.")
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
62
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
63 (defvar rfc2047-charset-encoding-alist
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
64 '((us-ascii . nil)
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
65 (iso-8859-1 . Q)
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
66 (iso-8859-2 . Q)
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
67 (iso-8859-3 . Q)
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
68 (iso-8859-4 . Q)
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
69 (iso-8859-5 . B)
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
70 (koi8-r . B)
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
71 (iso-8859-7 . B)
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
72 (iso-8859-8 . B)
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
73 (iso-8859-9 . Q)
33304
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
74 (iso-8859-14 . Q)
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
75 (iso-8859-15 . Q)
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
76 (iso-2022-jp . B)
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
77 (iso-2022-kr . B)
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
78 (gb2312 . B)
90684
53a222d8d8e8 (rfc2047-charset-encoding-alist): Add gbk and GB18030.
Kenichi Handa <handa@m17n.org>
parents: 90601
diff changeset
79 (gbk . B)
53a222d8d8e8 (rfc2047-charset-encoding-alist): Add gbk and GB18030.
Kenichi Handa <handa@m17n.org>
parents: 90601
diff changeset
80 (gb18030 . B)
35838
53eebdb81828 2001-02-01 ShengHuo ZHU <zsh@cs.rochester.edu>
ShengHuo ZHU <zsh@cs.rochester.edu>
parents: 35453
diff changeset
81 (big5 . B)
53eebdb81828 2001-02-01 ShengHuo ZHU <zsh@cs.rochester.edu>
ShengHuo ZHU <zsh@cs.rochester.edu>
parents: 35453
diff changeset
82 (cn-big5 . B)
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
83 (cn-gb . B)
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
84 (cn-gb-2312 . B)
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
85 (euc-kr . B)
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
86 (iso-2022-jp-2 . B)
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
87 (iso-2022-int-1 . B)
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
88 (viscii . Q))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
89 "Alist of MIME charsets to RFC2047 encodings.
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
90 Valid encodings are nil, `Q' and `B'. These indicate binary (no) encoding,
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
91 quoted-printable and base64 respectively.")
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
92
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
93 (defvar rfc2047-encode-function-alist
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
94 '((Q . rfc2047-q-encode-string)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
95 (B . rfc2047-b-encode-string)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
96 (nil . identity))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
97 "Alist of RFC2047 encodings to encoding functions.")
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
98
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
99 (defvar rfc2047-encode-encoded-words t
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
100 "Whether encoded words should be encoded again.")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
101
87097
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
102 (defvar rfc2047-allow-irregular-q-encoded-words t
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
103 "*Whether to decode irregular Q-encoded words.")
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
104
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
105 (eval-and-compile ;; Necessary to hard code them in `rfc2047-decode-region'.
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
106 (defconst rfc2047-encoded-word-regexp
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
107 "=\\?\\([^][\000-\040()<>@,\;:*\\\"/?.=]+\\)\\(?:\\*[^?]+\\)?\\?\
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
108 \\(B\\?[+/0-9A-Za-z]*=*\
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
109 \\|Q\\?[ ->@-~]*\
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
110 \\)\\?="
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
111 "Regexp that matches encoded word."
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
112 ;; The patterns for the B encoding and the Q encoding, i.e. the ones
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
113 ;; beginning with "B" and "Q" respectively, are restricted into only
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
114 ;; the characters that those encodings may generally use.
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
115 )
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
116 (defconst rfc2047-encoded-word-regexp-loose
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
117 "=\\?\\([^][\000-\040()<>@,\;:*\\\"/?.=]+\\)\\(?:\\*[^?]+\\)?\\?\
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
118 \\(B\\?[+/0-9A-Za-z]*=*\
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
119 \\|Q\\?\\(?:\\?+[ -<>@-~]\\)?\\(?:[ ->@-~]+\\?+[ -<>@-~]\\)*[ ->@-~]*\\?*\
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
120 \\)\\?="
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
121 "Regexp that matches encoded word allowing loose Q encoding."
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
122 ;; The pattern for the Q encoding, i.e. the one beginning with "Q",
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
123 ;; is similar to:
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
124 ;; "Q\\?\\(\\?+[^\n=?]\\)?\\([^\n?]+\\?+[^\n=?]\\)*[^\n?]*\\?*"
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
125 ;; <--------1-------><----------2,3----------><--4--><-5->
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
126 ;; They mean:
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
127 ;; 1. After "Q?", allow "?"s that follow a character other than "=".
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
128 ;; 2. Allow "=" after "Q?"; it isn't regarded as the terminator.
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
129 ;; 3. In the middle of an encoded word, allow "?"s that follow a
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
130 ;; character other than "=".
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
131 ;; 4. Allow any characters other than "?" in the middle of an
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
132 ;; encoded word.
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
133 ;; 5. At the end, allow "?"s.
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
134 ))
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
135
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
136 ;;;
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
137 ;;; Functions for encoding RFC2047 messages
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
138 ;;;
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
139
57243
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
140 (defun rfc2047-qp-or-base64 ()
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
141 "Return the type with which to encode the buffer.
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
142 This is either `base64' or `quoted-printable'."
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
143 (save-excursion
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
144 (let ((limit (min (point-max) (+ 2000 (point-min))))
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
145 (n8bit 0))
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
146 (goto-char (point-min))
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
147 (skip-chars-forward "\x20-\x7f\r\n\t" limit)
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
148 (while (< (point) limit)
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
149 (incf n8bit)
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
150 (forward-char 1)
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
151 (skip-chars-forward "\x20-\x7f\r\n\t" limit))
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
152 (if (or (< (* 6 n8bit) (- limit (point-min)))
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
153 ;; Don't base64, say, a short line with a single
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
154 ;; non-ASCII char when splitting parts by charset.
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
155 (= n8bit 1))
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
156 'quoted-printable
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
157 'base64))))
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
158
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
159 (defun rfc2047-narrow-to-field ()
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
160 "Narrow the buffer to the header on the current line."
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
161 (beginning-of-line)
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
162 (narrow-to-region
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
163 (point)
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
164 (progn
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
165 (forward-line 1)
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
166 (if (re-search-forward "^[^ \n\t]" nil t)
85712
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
167 (point-at-bol)
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
168 (point-max))))
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
169 (goto-char (point-min)))
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
170
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
171 (defun rfc2047-field-value ()
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
172 "Return the value of the field at point."
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
173 (save-excursion
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
174 (save-restriction
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
175 (rfc2047-narrow-to-field)
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
176 (re-search-forward ":[ \t\n]*" nil t)
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
177 (buffer-substring-no-properties (point) (point-max)))))
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
178
72605
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
179 (defun rfc2047-quote-special-characters-in-quoted-strings (&optional
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
180 encodable-regexp)
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
181 "Quote special characters with `\\'s in quoted strings.
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
182 Quoting will not be done in a quoted string if it contains characters
85712
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
183 matching ENCODABLE-REGEXP or it is within parentheses."
72605
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
184 (goto-char (point-min))
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
185 (let ((tspecials (concat "[" ietf-drums-tspecials "]"))
85712
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
186 (start (point))
72810
709ee6c1e02a Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 72632
diff changeset
187 beg end)
72605
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
188 (with-syntax-table (standard-syntax-table)
85712
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
189 (while (not (eobp))
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
190 (if (ignore-errors
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
191 (forward-list 1)
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
192 (eq (char-before) ?\)))
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
193 (forward-list -1)
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
194 (goto-char (point-max)))
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
195 (save-restriction
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
196 (narrow-to-region start (point))
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
197 (goto-char start)
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
198 (while (search-forward "\"" nil t)
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
199 (setq beg (match-beginning 0))
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
200 (unless (eq (char-before beg) ?\\)
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
201 (goto-char beg)
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
202 (setq beg (1+ beg))
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
203 (condition-case nil
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
204 (progn
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
205 (forward-sexp)
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
206 (setq end (1- (point)))
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
207 (goto-char beg)
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
208 (if (and encodable-regexp
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
209 (re-search-forward encodable-regexp end t))
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
210 (goto-char (1+ end))
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
211 (save-restriction
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
212 (narrow-to-region beg end)
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
213 (while (re-search-forward tspecials nil 'move)
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
214 (if (eq (char-before) ?\\)
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
215 (if (looking-at tspecials) ;; Already quoted.
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
216 (forward-char)
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
217 (insert "\\"))
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
218 (goto-char (match-beginning 0))
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
219 (insert "\\")
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
220 (forward-char))))
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
221 (forward-char)))
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
222 (error
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
223 (goto-char beg)))))
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
224 (goto-char (point-max)))
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
225 (forward-list 1)
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
226 (setq start (point))))))
72605
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
227
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
228 (defvar rfc2047-encoding-type 'address-mime
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
229 "The type of encoding done by `rfc2047-encode-region'.
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
230 This should be dynamically bound around calls to
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
231 `rfc2047-encode-region' to either `mime' or `address-mime'. See
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
232 `rfc2047-header-encoding-alist', for definitions.")
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
233
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
234 (defun rfc2047-encode-message-header ()
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
235 "Encode the message header according to `rfc2047-header-encoding-alist'.
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
236 Should be called narrowed to the head of the message."
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
237 (interactive "*")
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
238 (save-excursion
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
239 (goto-char (point-min))
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
240 (let (alist elem method)
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
241 (while (not (eobp))
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
242 (save-restriction
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
243 (rfc2047-narrow-to-field)
72605
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
244 (setq method nil
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
245 alist rfc2047-header-encoding-alist)
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
246 (while (setq elem (pop alist))
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
247 (when (or (and (stringp (car elem))
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
248 (looking-at (car elem)))
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
249 (eq (car elem) t))
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
250 (setq alist nil
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
251 method (cdr elem))))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
252 (if (not (rfc2047-encodable-p))
72605
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
253 (prog2
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
254 (when (eq method 'address-mime)
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
255 (rfc2047-quote-special-characters-in-quoted-strings))
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
256 (if (and (eq (mm-body-7-or-8) '8bit)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
257 (mm-multibyte-p)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
258 (mm-coding-system-p
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
259 (car message-posting-charset)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
260 ;; 8 bit must be decoded.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
261 (mm-encode-coding-region
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
262 (point-min) (point-max)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
263 (mm-charset-to-coding-system
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
264 (car message-posting-charset))))
50881
b042c57894f8 (rfc2047-header-encoding-alist): Add Followup-To.
Dave Love <fx@gnu.org>
parents: 47951
diff changeset
265 ;; No encoding necessary, but folding is nice
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
266 (when nil
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
267 (rfc2047-fold-region
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
268 (save-excursion
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
269 (goto-char (point-min))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
270 (skip-chars-forward "^:")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
271 (when (looking-at ": ")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
272 (forward-char 2))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
273 (point))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
274 (point-max))))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
275 ;; We found something that may perhaps be encoded.
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
276 (re-search-forward "^[^:]+: *" nil t)
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
277 (cond
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
278 ((eq method 'address-mime)
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
279 (rfc2047-encode-region (point) (point-max)))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
280 ((eq method 'mime)
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
281 (let ((rfc2047-encoding-type 'mime))
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
282 (rfc2047-encode-region (point) (point-max))))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
283 ((eq method 'default)
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
284 (if (and (featurep 'mule)
104830
79c2323377ac Use default-value rather than default-enable-multibyte-characters.
Glenn Morris <rgm@gnu.org>
parents: 103027
diff changeset
285 (if (boundp 'enable-multibyte-characters)
79c2323377ac Use default-value rather than default-enable-multibyte-characters.
Glenn Morris <rgm@gnu.org>
parents: 103027
diff changeset
286 (default-value 'enable-multibyte-characters))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
287 mail-parse-charset)
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
288 (mm-encode-coding-region (point) (point-max)
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
289 mail-parse-charset)))
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
290 ;; We get this when CC'ing messsages to newsgroups with
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
291 ;; 8-bit names. The group name mail copy just got
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
292 ;; unconditionally encoded. Previously, it would ask
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
293 ;; whether to encode, which was quite confusing for the
96376
c3309dba6542 American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents: 94662
diff changeset
294 ;; user. If the new behavior is wrong, tell me. I have
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
295 ;; left the old code commented out below.
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
296 ;; -- Per Abrahamsen <abraham@dina.kvl.dk> Date: 2001-10-07.
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
297 ;; Modified by Dave Love, with the commented-out code changed
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
298 ;; in accordance with changes elsewhere.
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
299 ((null method)
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
300 (rfc2047-encode-region (point) (point-max)))
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
301 ;;; ((null method)
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
302 ;;; (if (or (message-options-get
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
303 ;;; 'rfc2047-encode-message-header-encode-any)
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
304 ;;; (message-options-set
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
305 ;;; 'rfc2047-encode-message-header-encode-any
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
306 ;;; (y-or-n-p
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
307 ;;; "Some texts are not encoded. Encode anyway?")))
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
308 ;;; (rfc2047-encode-region (point-min) (point-max))
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
309 ;;; (error "Cannot send unencoded text")))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
310 ((mm-coding-system-p method)
85712
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
311 (if (or (and (featurep 'mule)
104830
79c2323377ac Use default-value rather than default-enable-multibyte-characters.
Glenn Morris <rgm@gnu.org>
parents: 103027
diff changeset
312 (if (boundp 'enable-multibyte-characters)
79c2323377ac Use default-value rather than default-enable-multibyte-characters.
Glenn Morris <rgm@gnu.org>
parents: 103027
diff changeset
313 (default-value 'enable-multibyte-characters)))
85712
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
314 (featurep 'file-coding))
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
315 (mm-encode-coding-region (point) (point-max) method)))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
316 ;; Hm.
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
317 (t)))
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
318 (goto-char (point-max)))))))
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
319
35985
b9c371244b90 (rfc2047-fold-region): Don't forward-char at EOB.
Dave Love <fx@gnu.org>
parents: 35838
diff changeset
320 ;; Fixme: This, and the require below may not be the Right Thing, but
b9c371244b90 (rfc2047-fold-region): Don't forward-char at EOB.
Dave Love <fx@gnu.org>
parents: 35838
diff changeset
321 ;; should be safe just before release. -- fx 2001-02-08
b9c371244b90 (rfc2047-fold-region): Don't forward-char at EOB.
Dave Love <fx@gnu.org>
parents: 35838
diff changeset
322
33304
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
323 (defun rfc2047-encodable-p ()
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
324 "Return non-nil if any characters in current buffer need encoding in headers.
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
325 The buffer may be narrowed."
35985
b9c371244b90 (rfc2047-fold-region): Don't forward-char at EOB.
Dave Love <fx@gnu.org>
parents: 35838
diff changeset
326 (require 'message) ; for message-posting-charset
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
327 (let ((charsets
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
328 (mm-find-mime-charset-region (point-min) (point-max))))
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
329 (goto-char (point-min))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
330 (or (and rfc2047-encode-encoded-words
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
331 (prog1
87097
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
332 (re-search-forward rfc2047-encoded-word-regexp nil t)
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
333 (goto-char (point-min))))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
334 (and charsets
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
335 (not (equal charsets (list (car message-posting-charset))))))))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
336
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
337 ;; Use this syntax table when parsing into regions that may need
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
338 ;; encoding. Double quotes are string delimiters, backslash is
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
339 ;; character quoting, and all other RFC 2822 special characters are
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
340 ;; treated as punctuation so we can use forward-sexp/forward-word to
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
341 ;; skip to the end of regions appropriately. Nb. ietf-drums does
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
342 ;; things differently.
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
343 (defconst rfc2047-syntax-table
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
344 ;; (make-char-table 'syntax-table '(2)) only works in Emacs.
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
345 (let ((table (make-syntax-table)))
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
346 ;; The following is done to work for setting all elements of the table
90104
a01e7a9f1659 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-14
Miles Bader <miles@gnu.org>
parents: 90054
diff changeset
347 ;; in Emacs 21-23 and XEmacs; it appears to be the cleanest way.
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
348 ;; Play safe and don't assume the form of the word syntax entry --
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
349 ;; copy it from ?a.
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
350 (if (fboundp 'set-char-table-range) ; Emacs
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
351 (funcall (intern "set-char-table-range")
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
352 table t (aref (standard-syntax-table) ?a))
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
353 (if (fboundp 'put-char-table)
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
354 (if (fboundp 'get-char-table) ; warning avoidance
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
355 (put-char-table t (get-char-table ?a (standard-syntax-table))
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
356 table))))
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
357 (modify-syntax-entry ?\\ "\\" table)
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
358 (modify-syntax-entry ?\" "\"" table)
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
359 (modify-syntax-entry ?\( "(" table)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
360 (modify-syntax-entry ?\) ")" table)
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
361 (modify-syntax-entry ?\< "." table)
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
362 (modify-syntax-entry ?\> "." table)
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
363 (modify-syntax-entry ?\[ "." table)
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
364 (modify-syntax-entry ?\] "." table)
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
365 (modify-syntax-entry ?: "." table)
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
366 (modify-syntax-entry ?\; "." table)
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
367 (modify-syntax-entry ?, "." table)
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
368 (modify-syntax-entry ?@ "." table)
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
369 table))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
370
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
371 (defun rfc2047-encode-region (b e)
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
372 "Encode words in region B to E that need encoding.
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
373 By default, the region is treated as containing RFC2822 addresses.
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
374 Dynamically bind `rfc2047-encoding-type' to change that."
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
375 (save-restriction
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
376 (narrow-to-region b e)
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
377 (let ((encodable-regexp (if rfc2047-encode-encoded-words
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
378 "[^\000-\177]+\\|=\\?"
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
379 "[^\000-\177]+"))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
380 start ; start of current token
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
381 end begin csyntax
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
382 ;; Whether there's an encoded word before the current token,
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
383 ;; either immediately or separated by space.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
384 last-encoded
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
385 (orig-text (buffer-substring-no-properties b e)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
386 (if (eq 'mime rfc2047-encoding-type)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
387 ;; Simple case. Continuous words in which all those contain
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
388 ;; non-ASCII characters are encoded collectively. Encoding
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
389 ;; ASCII words, including `Re:' used in Subject headers, is
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
390 ;; avoided for interoperability with non-MIME clients and
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
391 ;; for making it easy to find keywords.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
392 (progn
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
393 (goto-char (point-min))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
394 (while (progn (skip-chars-forward " \t\n")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
395 (not (eobp)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
396 (setq start (point))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
397 (while (and (looking-at "[ \t\n]*\\([^ \t\n]+\\)")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
398 (progn
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
399 (setq end (match-end 0))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
400 (re-search-forward encodable-regexp end t)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
401 (goto-char end))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
402 (if (> (point) start)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
403 (rfc2047-encode start (point))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
404 (goto-char end))))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
405 ;; `address-mime' case -- take care of quoted words, comments.
72605
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
406 (rfc2047-quote-special-characters-in-quoted-strings encodable-regexp)
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
407 (with-syntax-table rfc2047-syntax-table
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
408 (goto-char (point-min))
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
409 (condition-case err ; in case of unbalanced quotes
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
410 ;; Look for rfc2822-style: sequences of atoms, quoted
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
411 ;; strings, specials, whitespace. (Specials mustn't be
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
412 ;; encoded.)
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
413 (while (not (eobp))
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
414 ;; Skip whitespace.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
415 (skip-chars-forward " \t\n")
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
416 (setq start (point))
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
417 (cond
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
418 ((not (char-after))) ; eob
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
419 ;; else token start
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
420 ((eq ?\" (setq csyntax (char-syntax (char-after))))
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
421 ;; Quoted word.
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
422 (forward-sexp)
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
423 (setq end (point))
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
424 ;; Does it need encoding?
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
425 (goto-char start)
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
426 (if (re-search-forward encodable-regexp end 'move)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
427 ;; It needs encoding. Strip the quotes first,
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
428 ;; since encoded words can't occur in quotes.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
429 (progn
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
430 (goto-char end)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
431 (delete-backward-char 1)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
432 (goto-char start)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
433 (delete-char 1)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
434 (when last-encoded
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
435 ;; There was a preceding quoted word. We need
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
436 ;; to include any separating whitespace in this
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
437 ;; word to avoid it getting lost.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
438 (skip-chars-backward " \t")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
439 ;; A space is needed between the encoded words.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
440 (insert ? )
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
441 (setq start (point)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
442 end (1+ end)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
443 ;; Adjust the end position for the deleted quotes.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
444 (rfc2047-encode start (- end 2))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
445 (setq last-encoded t)) ; record that it was encoded
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
446 (setq last-encoded nil)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
447 ((eq ?. csyntax)
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
448 ;; Skip other delimiters, but record that they've
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
449 ;; potentially separated quoted words.
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
450 (forward-char)
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
451 (setq last-encoded nil))
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
452 ((eq ?\) csyntax)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
453 (error "Unbalanced parentheses"))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
454 ((eq ?\( csyntax)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
455 ;; Look for the end of parentheses.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
456 (forward-list)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
457 ;; Encode text as an unstructured field.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
458 (let ((rfc2047-encoding-type 'mime))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
459 (rfc2047-encode-region (1+ start) (1- (point))))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
460 (skip-chars-forward ")"))
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
461 (t ; normal token/whitespace sequence
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
462 ;; Find the end.
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
463 ;; Skip one ASCII word, or encode continuous words
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
464 ;; in which all those contain non-ASCII characters.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
465 (setq end nil)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
466 (while (not (or end (eobp)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
467 (when (looking-at "[\000-\177]+")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
468 (setq begin (point)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
469 end (match-end 0))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
470 (when (progn
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
471 (while (and (or (re-search-forward
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
472 "[ \t\n]\\|\\Sw" end 'move)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
473 (setq end nil))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
474 (eq ?\\ (char-syntax (char-before))))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
475 ;; Skip backslash-quoted characters.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
476 (forward-char))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
477 end)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
478 (setq end (match-beginning 0))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
479 (if rfc2047-encode-encoded-words
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
480 (progn
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
481 (goto-char begin)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
482 (when (search-forward "=?" end 'move)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
483 (goto-char (match-beginning 0))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
484 (setq end nil)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
485 (goto-char end))))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
486 ;; Where the value nil of `end' means there may be
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
487 ;; text to have to be encoded following the point.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
488 ;; Otherwise, the point reached to the end of ASCII
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
489 ;; words separated by whitespace or a special char.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
490 (unless end
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
491 (when (looking-at encodable-regexp)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
492 (goto-char (setq begin (match-end 0)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
493 (while (and (looking-at "[ \t\n]+\\([^ \t\n]+\\)")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
494 (setq end (match-end 0))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
495 (progn
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
496 (while (re-search-forward
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
497 encodable-regexp end t))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
498 (< begin (point)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
499 (goto-char begin)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
500 (or (not (re-search-forward "\\Sw" end t))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
501 (progn
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
502 (goto-char (match-beginning 0))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
503 nil)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
504 (goto-char end))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
505 (when (looking-at "[^ \t\n]+")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
506 (setq end (match-end 0))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
507 (if (re-search-forward "\\Sw+" end t)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
508 ;; There are special characters better
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
509 ;; to be encoded so that MTAs may parse
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
510 ;; them safely.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
511 (cond ((= end (point)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
512 ((looking-at (concat "\\sw*\\("
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
513 encodable-regexp
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
514 "\\)"))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
515 (setq end nil))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
516 (t
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
517 (goto-char (1- (match-end 0)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
518 (unless (= (point) (match-beginning 0))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
519 ;; Separate encodable text and
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
520 ;; delimiter.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
521 (insert " "))))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
522 (goto-char end)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
523 (skip-chars-forward " \t\n")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
524 (if (and (looking-at "[^ \t\n]+")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
525 (string-match encodable-regexp
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
526 (match-string 0)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
527 (setq end nil)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
528 (goto-char end)))))))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
529 (skip-chars-backward " \t\n")
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
530 (setq end (point))
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
531 (goto-char start)
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
532 (if (re-search-forward encodable-regexp end 'move)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
533 (progn
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
534 (unless (memq (char-before start) '(nil ?\t ? ))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
535 (if (progn
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
536 (goto-char start)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
537 (skip-chars-backward "^ \t\n")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
538 (and (looking-at "\\Sw+")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
539 (= (match-end 0) start)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
540 ;; Also encode bogus delimiters.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
541 (setq start (point))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
542 ;; Separate encodable text and delimiter.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
543 (goto-char start)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
544 (insert " ")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
545 (setq start (1+ start)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
546 end (1+ end))))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
547 (rfc2047-encode start end)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
548 (setq last-encoded t))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
549 (setq last-encoded nil)))))
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
550 (error
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
551 (if (or debug-on-quit debug-on-error)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
552 (signal (car err) (cdr err))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
553 (error "Invalid data for rfc2047 encoding: %s"
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
554 (mm-replace-in-string orig-text "[ \t\n]+" " "))))))))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
555 (rfc2047-fold-region b (point))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
556 (goto-char (point-max))))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
557
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
558 (defun rfc2047-encode-string (string)
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
559 "Encode words in STRING.
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
560 By default, the string is treated as containing addresses (see
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
561 `rfc2047-encoding-type')."
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
562 (mm-with-multibyte-buffer
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
563 (insert string)
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
564 (rfc2047-encode-region (point-min) (point-max))
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
565 (buffer-string)))
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
566
87097
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
567 ;; From RFC 2047:
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
568 ;; 2. Syntax of encoded-words
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
569 ;; [...]
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
570 ;; While there is no limit to the length of a multiple-line header
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
571 ;; field, each line of a header field that contains one or more
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
572 ;; 'encoded-word's is limited to 76 characters.
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
573 ;;
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
574 ;; In `rfc2047-encode-parameter' it is bound to nil, so don't defconst it.
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
575 (defvar rfc2047-encode-max-chars 76
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
576 "Maximum characters of each header line that contain encoded-words.
87097
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
577 According to RFC 2047, it is 76. If it is nil, encoded-words
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
578 will not be folded. Too small value may cause an error. You
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
579 should not change this value.")
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
580
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
581 (defun rfc2047-encode-1 (column string cs encoder start crest tail
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
582 &optional eword)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
583 "Subroutine used by `rfc2047-encode'."
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
584 (cond ((string-equal string "")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
585 (or eword ""))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
586 ((not rfc2047-encode-max-chars)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
587 (concat start
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
588 (funcall encoder (if cs
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
589 (mm-encode-coding-string string cs)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
590 string))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
591 "?="))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
592 ((>= column rfc2047-encode-max-chars)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
593 (when eword
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
594 (cond ((string-match "\n[ \t]+\\'" eword)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
595 ;; Reomove a superfluous empty line.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
596 (setq eword (substring eword 0 (match-beginning 0))))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
597 ((string-match "(+\\'" eword)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
598 ;; Break the line before the open parenthesis.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
599 (setq crest (concat crest (match-string 0 eword))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
600 eword (substring eword 0 (match-beginning 0))))))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
601 (rfc2047-encode-1 (length crest) string cs encoder start " " tail
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
602 (concat eword "\n" crest)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
603 (t
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
604 (let ((index 0)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
605 (limit (1- (length string)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
606 (prev "")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
607 next len)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
608 (while (and prev
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
609 (<= index limit))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
610 (setq next (concat start
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
611 (funcall encoder
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
612 (if cs
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
613 (mm-encode-coding-string
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
614 (substring string 0 (1+ index))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
615 cs)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
616 (substring string 0 (1+ index))))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
617 "?=")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
618 len (+ column (length next)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
619 (if (> len rfc2047-encode-max-chars)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
620 (setq next prev
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
621 prev nil)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
622 (if (or (< index limit)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
623 (<= (+ len (or (string-match "\n" tail)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
624 (length tail)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
625 rfc2047-encode-max-chars))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
626 (setq prev next
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
627 index (1+ index))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
628 (if (string-match "\\`)+" tail)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
629 ;; Break the line after the close parenthesis.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
630 (setq tail (concat (substring tail 0 (match-end 0))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
631 "\n "
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
632 (substring tail (match-end 0)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
633 prev next
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
634 index (1+ index))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
635 (setq next prev
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
636 prev nil)))))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
637 (if (> index limit)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
638 (concat eword next tail)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
639 (if (= 0 index)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
640 (if (and eword
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
641 (string-match "(+\\'" eword))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
642 (setq crest (concat crest (match-string 0 eword))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
643 eword (substring eword 0 (match-beginning 0)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
644 (setq eword (concat eword next)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
645 (setq crest " "
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
646 eword (concat eword next)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
647 (when (string-match "\n[ \t]+\\'" eword)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
648 ;; Reomove a superfluous empty line.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
649 (setq eword (substring eword 0 (match-beginning 0))))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
650 (rfc2047-encode-1 (length crest) (substring string index)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
651 cs encoder start " " tail
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
652 (concat eword "\n" crest)))))))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
653
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
654 (defun rfc2047-encode (b e)
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
655 "Encode the word(s) in the region B to E.
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
656 Point moves to the end of the region."
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
657 (let ((mime-charset (or (mm-find-mime-charset-region b e) (list 'us-ascii)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
658 cs encoding tail crest eword)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
659 (cond ((> (length mime-charset) 1)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
660 (error "Can't rfc2047-encode `%s'"
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
661 (buffer-substring-no-properties b e)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
662 ((= (length mime-charset) 1)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
663 (setq mime-charset (car mime-charset)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
664 cs (mm-charset-to-coding-system mime-charset))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
665 (unless (and (mm-multibyte-p)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
666 (mm-coding-system-p cs))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
667 (setq cs nil))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
668 (save-restriction
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
669 (narrow-to-region b e)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
670 (setq encoding
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
671 (or (cdr (assq mime-charset
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
672 rfc2047-charset-encoding-alist))
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
673 ;; For the charsets that don't have a preferred
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
674 ;; encoding, choose the one that's shorter.
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
675 (if (eq (rfc2047-qp-or-base64) 'base64)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
676 'B
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
677 'Q)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
678 (widen)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
679 (goto-char e)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
680 (skip-chars-forward "^ \t\n")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
681 ;; `tail' may contain a close parenthesis.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
682 (setq tail (buffer-substring-no-properties e (point)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
683 (goto-char b)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
684 (setq b (point-marker)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
685 e (set-marker (make-marker) e))
85712
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
686 (rfc2047-fold-region (point-at-bol) b)
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
687 (goto-char b)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
688 (skip-chars-backward "^ \t\n")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
689 (unless (= 0 (skip-chars-backward " \t"))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
690 ;; `crest' may contain whitespace and an open parenthesis.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
691 (setq crest (buffer-substring-no-properties (point) b)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
692 (setq eword (rfc2047-encode-1
85712
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
693 (- b (point-at-bol))
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
694 (mm-replace-in-string
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
695 (buffer-substring-no-properties b e)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
696 "\n\\([ \t]?\\)" "\\1")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
697 cs
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
698 (or (cdr (assq encoding
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
699 rfc2047-encode-function-alist))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
700 'identity)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
701 (concat "=?" (downcase (symbol-name mime-charset))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
702 "?" (upcase (symbol-name encoding)) "?")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
703 (or crest " ")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
704 tail))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
705 (delete-region (if (eq (aref eword 0) ?\n)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
706 (if (bolp)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
707 ;; The line was folded before encoding.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
708 (1- (point))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
709 (point))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
710 (goto-char b))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
711 (+ e (length tail)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
712 ;; `eword' contains `crest' and `tail'.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
713 (insert eword)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
714 (set-marker b nil)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
715 (set-marker e nil)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
716 (unless (or (/= 0 (length tail))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
717 (eobp)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
718 (looking-at "[ \t\n)]"))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
719 (insert " "))))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
720 (t
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
721 (goto-char e)))))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
722
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
723 (defun rfc2047-fold-field ()
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
724 "Fold the current header field."
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
725 (save-excursion
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
726 (save-restriction
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
727 (rfc2047-narrow-to-field)
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
728 (rfc2047-fold-region (point-min) (point-max)))))
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
729
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
730 (defun rfc2047-fold-region (b e)
35985
b9c371244b90 (rfc2047-fold-region): Don't forward-char at EOB.
Dave Love <fx@gnu.org>
parents: 35838
diff changeset
731 "Fold long lines in region B to E."
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
732 (save-restriction
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
733 (narrow-to-region b e)
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
734 (goto-char (point-min))
33304
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
735 (let ((break nil)
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
736 (qword-break nil)
50881
b042c57894f8 (rfc2047-header-encoding-alist): Add Followup-To.
Dave Love <fx@gnu.org>
parents: 47951
diff changeset
737 (first t)
33304
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
738 (bol (save-restriction
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
739 (widen)
85712
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
740 (point-at-bol))))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
741 (while (not (eobp))
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
742 (when (and (or break qword-break)
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
743 (> (- (point) bol) 76))
33304
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
744 (goto-char (or break qword-break))
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
745 (setq break nil
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
746 qword-break nil)
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
747 (skip-chars-backward " \t")
50881
b042c57894f8 (rfc2047-header-encoding-alist): Add Followup-To.
Dave Love <fx@gnu.org>
parents: 47951
diff changeset
748 (if (looking-at "[ \t]")
47945
3915f2c7691e (message-posting-charset): defvar when compiling.
Dave Love <fx@gnu.org>
parents: 38413
diff changeset
749 (insert ?\n)
35453
26726eff41ca 2001-01-21 ShengHuo ZHU <zsh@cs.rochester.edu>
ShengHuo ZHU <zsh@cs.rochester.edu>
parents: 34674
diff changeset
750 (insert "\n "))
33304
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
751 (setq bol (1- (point)))
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
752 ;; Don't break before the first non-LWSP characters.
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
753 (skip-chars-forward " \t")
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
754 (unless (eobp)
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
755 (forward-char 1)))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
756 (cond
33304
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
757 ((eq (char-after) ?\n)
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
758 (forward-char 1)
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
759 (setq bol (point)
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
760 break nil
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
761 qword-break nil)
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
762 (skip-chars-forward " \t")
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
763 (unless (or (eobp) (eq (char-after) ?\n))
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
764 (forward-char 1)))
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
765 ((eq (char-after) ?\r)
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
766 (forward-char 1))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
767 ((memq (char-after) '(? ?\t))
33304
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
768 (skip-chars-forward " \t")
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
769 (unless first ;; Don't break just after the header name.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
770 (setq break (point))))
33304
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
771 ((not break)
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
772 (if (not (looking-at "=\\?[^=]"))
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
773 (if (eq (char-after) ?=)
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
774 (forward-char 1)
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
775 (skip-chars-forward "^ \t\n\r="))
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
776 ;; Don't break at the start of the field.
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
777 (unless (= (point) b)
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
778 (setq qword-break (point)))
33304
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
779 (skip-chars-forward "^ \t\n\r")))
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
780 (t
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
781 (skip-chars-forward "^ \t\n\r")))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
782 (setq first nil))
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
783 (when (and (or break qword-break)
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
784 (> (- (point) bol) 76))
33304
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
785 (goto-char (or break qword-break))
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
786 (setq break nil
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
787 qword-break nil)
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
788 (if (or (> 0 (skip-chars-backward " \t"))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
789 (looking-at "[ \t]"))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
790 (insert ?\n)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
791 (insert "\n "))
33304
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
792 (setq bol (1- (point)))
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
793 ;; Don't break before the first non-LWSP characters.
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
794 (skip-chars-forward " \t")
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
795 (unless (eobp)
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
796 (forward-char 1))))))
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
797
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
798 (defun rfc2047-unfold-field ()
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
799 "Fold the current line."
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
800 (save-excursion
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
801 (save-restriction
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
802 (rfc2047-narrow-to-field)
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
803 (rfc2047-unfold-region (point-min) (point-max)))))
33304
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
804
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
805 (defun rfc2047-unfold-region (b e)
35985
b9c371244b90 (rfc2047-fold-region): Don't forward-char at EOB.
Dave Love <fx@gnu.org>
parents: 35838
diff changeset
806 "Unfold lines in region B to E."
33304
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
807 (save-restriction
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
808 (narrow-to-region b e)
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
809 (goto-char (point-min))
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
810 (let ((bol (save-restriction
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
811 (widen)
85712
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
812 (point-at-bol)))
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
813 (eol (point-at-eol)))
33304
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
814 (forward-line 1)
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
815 (while (not (eobp))
50881
b042c57894f8 (rfc2047-header-encoding-alist): Add Followup-To.
Dave Love <fx@gnu.org>
parents: 47951
diff changeset
816 (if (and (looking-at "[ \t]")
85712
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
817 (< (- (point-at-eol) bol) 76))
50881
b042c57894f8 (rfc2047-header-encoding-alist): Add Followup-To.
Dave Love <fx@gnu.org>
parents: 47951
diff changeset
818 (delete-region eol (progn
b042c57894f8 (rfc2047-header-encoding-alist): Add Followup-To.
Dave Love <fx@gnu.org>
parents: 47951
diff changeset
819 (goto-char eol)
b042c57894f8 (rfc2047-header-encoding-alist): Add Followup-To.
Dave Love <fx@gnu.org>
parents: 47951
diff changeset
820 (skip-chars-forward "\r\n")
b042c57894f8 (rfc2047-header-encoding-alist): Add Followup-To.
Dave Love <fx@gnu.org>
parents: 47951
diff changeset
821 (point)))
85712
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
822 (setq bol (point-at-bol)))
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
823 (setq eol (point-at-eol))
33304
d401dfab680a Require gnus-util.
Dave Love <fx@gnu.org>
parents: 33127
diff changeset
824 (forward-line 1)))))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
825
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
826 (defun rfc2047-b-encode-string (string)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
827 "Base64-encode the header contained in STRING."
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
828 (base64-encode-string string t))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
829
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
830 (defun rfc2047-q-encode-string (string)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
831 "Quoted-printable-encode the header in STRING."
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
832 (mm-with-unibyte-buffer
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
833 (insert string)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
834 (quoted-printable-encode-region
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
835 (point-min) (point-max) nil
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
836 ;; = (\075), _ (\137), ? (\077) are used in the encoded word.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
837 ;; Avoid using 8bit characters.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
838 ;; This list excludes `especials' (see the RFC2047 syntax),
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
839 ;; meaning that some characters in non-structured fields will
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
840 ;; get encoded when they con't need to be. The following is
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
841 ;; what it used to be.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
842 ;;; ;; Equivalent to "^\000-\007\011\013\015-\037\200-\377=_?"
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
843 ;;; "\010\012\014\040-\074\076\100-\136\140-\177")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
844 "-\b\n\f !#-'*+0-9A-Z\\^`-~\d")
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
845 (subst-char-in-region (point-min) (point-max) ? ?_)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
846 (buffer-string)))
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
847
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
848 (defun rfc2047-encode-parameter (param value)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
849 "Return and PARAM=VALUE string encoded in the RFC2047-like style.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
850 This is a replacement for the `rfc2231-encode-string' function.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
851
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
852 When attaching files as MIME parts, we should use the RFC2231 encoding
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
853 to specify the file names containing non-ASCII characters. However,
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
854 many mail softwares don't support it in practice and recipients won't
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
855 be able to extract files with correct names. Instead, the RFC2047-like
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
856 encoding is acceptable generally. This function provides the very
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
857 RFC2047-like encoding, resigning to such a regrettable trend. To use
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
858 it, put the following line in your ~/.gnus.el file:
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
859
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
860 \(defalias 'mail-header-encode-parameter 'rfc2047-encode-parameter)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
861 "
78125
f0705c4da65a Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 75347
diff changeset
862 (let ((rfc2047-encoding-type 'mime)
f0705c4da65a Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 75347
diff changeset
863 (rfc2047-encode-max-chars nil))
f0705c4da65a Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 75347
diff changeset
864 (rfc2045-encode-string param (rfc2047-encode-string value))))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
865
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
866 ;;;
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
867 ;;; Functions for decoding RFC2047 messages
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
868 ;;;
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
869
60161
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
870 (defvar rfc2047-quote-decoded-words-containing-tspecials nil
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
871 "If non-nil, quote decoded words containing special characters.")
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
872
66299
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
873 (defvar rfc2047-allow-incomplete-encoded-text t
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
874 "*Non-nil means allow incomplete encoded-text in successive encoded-words.
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
875 Dividing of encoded-text in the place other than character boundaries
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
876 violates RFC2047 section 5, while we have a capability to decode it.
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
877 If it is non-nil, the decoder will decode B- or Q-encoding in each
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
878 encoded-word, concatenate them, and decode it by charset. Otherwise,
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
879 the decoder will fully decode each encoded-word before concatenating
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
880 them.")
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
881
72605
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
882 (defun rfc2047-strip-backslashes-in-quoted-strings ()
72632
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 72605
diff changeset
883 "Strip backslashes in quoted strings. `\\\"' remains."
72605
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
884 (goto-char (point-min))
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
885 (let (beg)
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
886 (with-syntax-table (standard-syntax-table)
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
887 (while (search-forward "\"" nil t)
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
888 (unless (eq (char-before) ?\\)
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
889 (setq beg (match-end 0))
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
890 (goto-char (match-beginning 0))
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
891 (condition-case nil
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
892 (progn
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
893 (forward-sexp)
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
894 (save-restriction
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
895 (narrow-to-region beg (1- (point)))
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
896 (goto-char beg)
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
897 (while (search-forward "\\" nil 'move)
72632
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 72605
diff changeset
898 (unless (memq (char-after) '(?\"))
72605
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
899 (delete-backward-char 1))
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
900 (forward-char)))
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
901 (forward-char))
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
902 (error
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
903 (goto-char beg))))))))
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
904
100315
da90832da238 * rfc2047.el (rfc2047-charset-to-coding-system): Add new argument
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 96376
diff changeset
905 (defun rfc2047-charset-to-coding-system (charset &optional allow-override)
66299
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
906 "Return coding-system corresponding to MIME CHARSET.
100315
da90832da238 * rfc2047.el (rfc2047-charset-to-coding-system): Add new argument
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 96376
diff changeset
907 If your Emacs implementation can't decode CHARSET, return nil.
da90832da238 * rfc2047.el (rfc2047-charset-to-coding-system): Add new argument
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 96376
diff changeset
908
da90832da238 * rfc2047.el (rfc2047-charset-to-coding-system): Add new argument
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 96376
diff changeset
909 If allow-override is given, use `mm-charset-override-alist' to
da90832da238 * rfc2047.el (rfc2047-charset-to-coding-system): Add new argument
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 96376
diff changeset
910 map undesired charset names to their replacement. This should
da90832da238 * rfc2047.el (rfc2047-charset-to-coding-system): Add new argument
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 96376
diff changeset
911 only be used for decoding, not for encoding."
66299
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
912 (when (stringp charset)
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
913 (setq charset (intern (downcase charset))))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
914 (when (or (not charset)
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
915 (eq 'gnus-all mail-parse-ignored-charsets)
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
916 (memq 'gnus-all mail-parse-ignored-charsets)
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
917 (memq charset mail-parse-ignored-charsets))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
918 (setq charset mail-parse-charset))
100315
da90832da238 * rfc2047.el (rfc2047-charset-to-coding-system): Add new argument
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 96376
diff changeset
919 (let ((cs (mm-charset-to-coding-system charset nil allow-override)))
66299
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
920 (cond ((eq cs 'ascii)
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
921 (setq cs (or (mm-charset-to-coding-system mail-parse-charset)
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
922 'raw-text)))
69046
d037a8cb1b92 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-106
Miles Bader <miles@gnu.org>
parents: 68633
diff changeset
923 ((mm-coding-system-p cs))
66299
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
924 ((and charset
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
925 (listp mail-parse-ignored-charsets)
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
926 (memq 'gnus-unknown mail-parse-ignored-charsets))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
927 (setq cs (mm-charset-to-coding-system mail-parse-charset))))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
928 (if (eq cs 'ascii)
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
929 'raw-text
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
930 cs)))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
931
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
932 (defun rfc2047-decode-encoded-words (words)
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
933 "Decode successive encoded-words in WORDS and return a decoded string.
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
934 Each element of WORDS looks like (CHARSET ENCODING ENCODED-TEXT
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
935 ENCODED-WORD)."
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
936 (let (word charset cs encoding text rest)
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
937 (while words
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
938 (setq word (pop words))
69944
a87e26272828 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-210
Miles Bader <miles@gnu.org>
parents: 69046
diff changeset
939 (if (and (setq cs (rfc2047-charset-to-coding-system
100315
da90832da238 * rfc2047.el (rfc2047-charset-to-coding-system): Add new argument
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 96376
diff changeset
940 (setq charset (car word)) t))
66299
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
941 (condition-case code
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
942 (cond ((char-equal ?B (nth 1 word))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
943 (setq text (base64-decode-string
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
944 (rfc2047-pad-base64 (nth 2 word)))))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
945 ((char-equal ?Q (nth 1 word))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
946 (setq text (quoted-printable-decode-string
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
947 (mm-subst-char-in-string
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
948 ?_ ? (nth 2 word) t)))))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
949 (error
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
950 (message "%s" (error-message-string code))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
951 nil)))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
952 (if (and rfc2047-allow-incomplete-encoded-text
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
953 (eq cs (caar rest)))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
954 ;; Concatenate text of which the charset is the same.
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
955 (setcdr (car rest) (concat (cdar rest) text))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
956 (push (cons cs text) rest))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
957 ;; Don't decode encoded-word.
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
958 (push (cons nil (nth 3 word)) rest)))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
959 (while rest
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
960 (setq words (concat
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
961 (or (and (setq cs (caar rest))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
962 (condition-case code
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
963 (mm-decode-coding-string (cdar rest) cs)
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
964 (error
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
965 (message "%s" (error-message-string code))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
966 nil)))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
967 (concat (when (cdr rest) " ")
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
968 (cdar rest)
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
969 (when (and words
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
970 (not (eq (string-to-char words) ? )))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
971 " ")))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
972 words)
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
973 rest (cdr rest)))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
974 words))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
975
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
976 ;; Fixme: This should decode in place, not cons intermediate strings.
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
977 ;; Also check whether it needs to worry about delimiting fields like
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
978 ;; encoding.
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
979
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
980 ;; In fact it's reported that (invalid) encoding of mailboxes in
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
981 ;; addr-specs is in use, so delimiting fields might help. Probably
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
982 ;; not decoding a word which isn't properly delimited is good enough
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
983 ;; and worthwhile (is it more correct or not?), e.g. something like
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
984 ;; `=?iso-8859-1?q?foo?=@'.
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
985
72605
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
986 (defun rfc2047-decode-region (start end &optional address-mime)
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
987 "Decode MIME-encoded words in region between START and END.
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
988 If ADDRESS-MIME is non-nil, strip backslashes which precede characters
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
989 other than `\"' and `\\' in quoted strings."
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
990 (interactive "r")
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
991 (let ((case-fold-search t)
87097
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
992 (eword-regexp
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
993 (if rfc2047-allow-irregular-q-encoded-words
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
994 (eval-when-compile
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
995 (concat "[\n\t ]*\\(" rfc2047-encoded-word-regexp-loose "\\)"))
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
996 (eval-when-compile
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
997 (concat "[\n\t ]*\\(" rfc2047-encoded-word-regexp "\\)"))))
66299
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
998 b e match words)
47951
9cd6016af581 Revert decoding changes temporarily.
Dave Love <fx@gnu.org>
parents: 47945
diff changeset
999 (save-excursion
9cd6016af581 Revert decoding changes temporarily.
Dave Love <fx@gnu.org>
parents: 47945
diff changeset
1000 (save-restriction
9cd6016af581 Revert decoding changes temporarily.
Dave Love <fx@gnu.org>
parents: 47945
diff changeset
1001 (narrow-to-region start end)
72605
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1002 (when address-mime
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1003 (rfc2047-strip-backslashes-in-quoted-strings))
66299
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
1004 (goto-char (setq b start))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
1005 ;; Look for the encoded-words.
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
1006 (while (setq match (re-search-forward eword-regexp nil t))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
1007 (setq e (match-beginning 1)
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
1008 end (match-end 0)
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
1009 words nil)
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
1010 (while match
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
1011 (push (list (match-string 2) ;; charset
85712
a3c27999decb Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents: 78224
diff changeset
1012 (char-after (match-beginning 3)) ;; encoding
87097
781256628613 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 86154
diff changeset
1013 (substring (match-string 3) 2) ;; encoded-text
66299
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
1014 (match-string 1)) ;; encoded-word
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
1015 words)
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
1016 ;; Look for the subsequent encoded-words.
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
1017 (when (setq match (looking-at eword-regexp))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
1018 (goto-char (setq end (match-end 0)))))
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
1019 ;; Replace the encoded-words with the decoded one.
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
1020 (delete-region e end)
01b85ec4a61d Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Miles Bader <miles@gnu.org>
parents: 64754
diff changeset
1021 (insert (rfc2047-decode-encoded-words (nreverse words)))
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1022 (save-restriction
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1023 (narrow-to-region e (point))
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1024 (goto-char e)
60161
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1025 ;; Remove newlines between decoded words, though such
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1026 ;; things essentially must not be there.
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1027 (while (re-search-forward "[\n\r]+" nil t)
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1028 (replace-match " "))
106099
fc3c7104330d (rfc2047-decode-region): Don't quote decoded words containing tspecial
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 104830
diff changeset
1029 (setq end (point-max))
60161
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1030 ;; Quote decoded words if there are special characters
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1031 ;; which might violate RFC2822.
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1032 (when (and rfc2047-quote-decoded-words-containing-tspecials
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1033 (let ((regexp (car (rassq
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1034 'address-mime
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1035 rfc2047-header-encoding-alist))))
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1036 (when regexp
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1037 (save-restriction
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1038 (widen)
106099
fc3c7104330d (rfc2047-decode-region): Don't quote decoded words containing tspecial
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 104830
diff changeset
1039 (and
fc3c7104330d (rfc2047-decode-region): Don't quote decoded words containing tspecial
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 104830
diff changeset
1040 ;; Don't quote words if already quoted.
fc3c7104330d (rfc2047-decode-region): Don't quote decoded words containing tspecial
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 104830
diff changeset
1041 (not (and (eq (char-before e) ?\")
fc3c7104330d (rfc2047-decode-region): Don't quote decoded words containing tspecial
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 104830
diff changeset
1042 (eq (char-after end) ?\")))
fc3c7104330d (rfc2047-decode-region): Don't quote decoded words containing tspecial
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 104830
diff changeset
1043 (progn
fc3c7104330d (rfc2047-decode-region): Don't quote decoded words containing tspecial
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 104830
diff changeset
1044 (beginning-of-line)
fc3c7104330d (rfc2047-decode-region): Don't quote decoded words containing tspecial
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 104830
diff changeset
1045 (while (and (memq (char-after) '(? ?\t))
fc3c7104330d (rfc2047-decode-region): Don't quote decoded words containing tspecial
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 104830
diff changeset
1046 (zerop (forward-line -1))))
fc3c7104330d (rfc2047-decode-region): Don't quote decoded words containing tspecial
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 104830
diff changeset
1047 (looking-at regexp)))))))
60161
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1048 (let (quoted)
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1049 (goto-char e)
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1050 (skip-chars-forward " \t")
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1051 (setq start (point))
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1052 (setq quoted (eq (char-after) ?\"))
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1053 (goto-char (point-max))
103027
25a15bc4c9bb (rfc2047-decode-region): Don't skip past `start', which
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1054 (skip-chars-backward " \t" start)
60161
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1055 (if (setq quoted (and quoted
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1056 (> (point) (1+ start))
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1057 (eq (char-before) ?\")))
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1058 (progn
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1059 (backward-char)
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1060 (setq start (1+ start)
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1061 end (point-marker)))
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1062 (setq end (point-marker)))
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1063 (goto-char start)
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1064 (while (search-forward "\"" end t)
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1065 (when (prog2
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1066 (backward-char)
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1067 (zerop (% (skip-chars-backward "\\\\") 2))
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1068 (goto-char (match-beginning 0)))
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1069 (insert "\\"))
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1070 (forward-char))
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1071 (when (and (not quoted)
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1072 (progn
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1073 (goto-char start)
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1074 (re-search-forward
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1075 (concat "[" ietf-drums-tspecials "]")
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1076 end t)))
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1077 (goto-char start)
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1078 (insert "\"")
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1079 (goto-char end)
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1080 (insert "\""))
b070535d2416 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Miles Bader <miles@gnu.org>
parents: 58835
diff changeset
1081 (set-marker end nil)))
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1082 (goto-char (point-max)))
47951
9cd6016af581 Revert decoding changes temporarily.
Dave Love <fx@gnu.org>
parents: 47945
diff changeset
1083 (when (and (mm-multibyte-p)
9cd6016af581 Revert decoding changes temporarily.
Dave Love <fx@gnu.org>
parents: 47945
diff changeset
1084 mail-parse-charset
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1085 (not (eq mail-parse-charset 'us-ascii))
47951
9cd6016af581 Revert decoding changes temporarily.
Dave Love <fx@gnu.org>
parents: 47945
diff changeset
1086 (not (eq mail-parse-charset 'gnus-decoded)))
9cd6016af581 Revert decoding changes temporarily.
Dave Love <fx@gnu.org>
parents: 47945
diff changeset
1087 (mm-decode-coding-region b e mail-parse-charset))
9cd6016af581 Revert decoding changes temporarily.
Dave Love <fx@gnu.org>
parents: 47945
diff changeset
1088 (setq b (point)))
9cd6016af581 Revert decoding changes temporarily.
Dave Love <fx@gnu.org>
parents: 47945
diff changeset
1089 (when (and (mm-multibyte-p)
9cd6016af581 Revert decoding changes temporarily.
Dave Love <fx@gnu.org>
parents: 47945
diff changeset
1090 mail-parse-charset
9cd6016af581 Revert decoding changes temporarily.
Dave Love <fx@gnu.org>
parents: 47945
diff changeset
1091 (not (eq mail-parse-charset 'us-ascii))
9cd6016af581 Revert decoding changes temporarily.
Dave Love <fx@gnu.org>
parents: 47945
diff changeset
1092 (not (eq mail-parse-charset 'gnus-decoded)))
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1093 (mm-decode-coding-region b (point-max) mail-parse-charset))))))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1094
72605
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1095 (defun rfc2047-decode-address-region (start end)
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1096 "Decode MIME-encoded words in region between START and END.
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1097 Backslashes which precede characters other than `\"' and `\\' in quoted
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1098 strings are stripped."
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1099 (rfc2047-decode-region start end t))
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1100
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1101 (defun rfc2047-decode-string (string &optional address-mime)
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1102 "Decode MIME-encoded STRING and return the result.
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1103 If ADDRESS-MIME is non-nil, strip backslashes which precede characters
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1104 other than `\"' and `\\' in quoted strings."
92777
1186239f19c8 (rfc2047-decode-string): Don't use `m'. Avoid mm-string-as-multibyte as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
1105 ;; (let ((m (mm-multibyte-p)))
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1106 (if (string-match "=\\?" string)
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1107 (with-temp-buffer
92777
1186239f19c8 (rfc2047-decode-string): Don't use `m'. Avoid mm-string-as-multibyte as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
1108 ;; We used to only call mm-enable-multibyte if `m' is non-nil,
1186239f19c8 (rfc2047-decode-string): Don't use `m'. Avoid mm-string-as-multibyte as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
1109 ;; but this can't be the right criterion. Don't just revert this
1186239f19c8 (rfc2047-decode-string): Don't use `m'. Avoid mm-string-as-multibyte as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
1110 ;; change if it encounters a bug. Please help me fix it
1186239f19c8 (rfc2047-decode-string): Don't use `m'. Avoid mm-string-as-multibyte as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
1111 ;; right instead. --Stef
1186239f19c8 (rfc2047-decode-string): Don't use `m'. Avoid mm-string-as-multibyte as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
1112 ;; The string returned should always be multibyte in a multibyte
1186239f19c8 (rfc2047-decode-string): Don't use `m'. Avoid mm-string-as-multibyte as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
1113 ;; session, i.e. the buffer should be multibyte before
1186239f19c8 (rfc2047-decode-string): Don't use `m'. Avoid mm-string-as-multibyte as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
1114 ;; `buffer-string' is called.
1186239f19c8 (rfc2047-decode-string): Don't use `m'. Avoid mm-string-as-multibyte as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
1115 (mm-enable-multibyte)
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1116 (insert string)
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1117 (inline
72605
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1118 (rfc2047-decode-region (point-min) (point-max) address-mime))
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1119 (buffer-string))
72605
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1120 (when address-mime
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1121 (setq string
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1122 (with-temp-buffer
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1123 (when (mm-multibyte-string-p string)
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1124 (mm-enable-multibyte))
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1125 (insert string)
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1126 (rfc2047-strip-backslashes-in-quoted-strings)
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1127 (buffer-string))))
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1128 ;; Fixme: As above, `m' here is inappropriate.
92777
1186239f19c8 (rfc2047-decode-string): Don't use `m'. Avoid mm-string-as-multibyte as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
1129 (if (and ;; m
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1130 mail-parse-charset
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1131 (not (eq mail-parse-charset 'us-ascii))
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1132 (not (eq mail-parse-charset 'gnus-decoded)))
61126
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
1133 ;; `decode-coding-string' in Emacs offers a third optional
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
1134 ;; arg NOCOPY to avoid consing a new string if the decoding
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
1135 ;; is "trivial". Unfortunately it currently doesn't
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
1136 ;; consider anything else than a `nil' coding system
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
1137 ;; trivial.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
1138 ;; `rfc2047-decode-string' is called multiple times for each
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
1139 ;; article during summary buffer generation, and we really
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
1140 ;; want to avoid unnecessary consing. So we bypass
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
1141 ;; `decode-coding-string' if the string is purely ASCII.
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
1142 (if (and (fboundp 'detect-coding-string)
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
1143 ;; string is purely ASCII
c0aa521e0ca7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Miles Bader <miles@gnu.org>
parents: 60161
diff changeset
1144 (eq (detect-coding-string string t) 'undecided))
92777
1186239f19c8 (rfc2047-decode-string): Don't use `m'. Avoid mm-string-as-multibyte as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
1145 string
1186239f19c8 (rfc2047-decode-string): Don't use `m'. Avoid mm-string-as-multibyte as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
1146 (mm-decode-coding-string string mail-parse-charset))
1186239f19c8 (rfc2047-decode-string): Don't use `m'. Avoid mm-string-as-multibyte as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
1147 (mm-string-to-multibyte string)))) ;; )
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1148
72605
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1149 (defun rfc2047-decode-address-string (string)
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1150 "Decode MIME-encoded STRING and return the result.
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1151 Backslashes which precede characters other than `\"' and `\\' in quoted
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1152 strings are stripped."
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1153 (rfc2047-decode-string string t))
de654a6735da Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69944
diff changeset
1154
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1155 (defun rfc2047-pad-base64 (string)
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1156 "Pad STRING to quartets."
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1157 ;; Be more liberal to accept buggy base64 strings. If
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1158 ;; base64-decode-string accepts buggy strings, this function could
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 55411
diff changeset
1159 ;; be aliased to identity.
57243
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
1160 (if (= 0 (mod (length string) 4))
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
1161 string
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
1162 (when (string-match "=+$" string)
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
1163 (setq string (substring string 0 (match-beginning 0))))
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
1164 (case (mod (length string) 4)
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
1165 (0 string)
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
1166 (1 string) ;; Error, don't pad it.
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
1167 (2 (concat string "=="))
c5e16264557d Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents: 56927
diff changeset
1168 (3 (concat string "=")))))
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1169
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1170 (provide 'rfc2047)
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1171
92777
1186239f19c8 (rfc2047-decode-string): Don't use `m'. Avoid mm-string-as-multibyte as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
1172 ;; arch-tag: a07fe3d4-22b5-4c4a-bd89-b1f82d5d36f6
31717
6b20b7e85e3c *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1173 ;;; rfc2047.el ends here