Mercurial > emacs
annotate lisp/gnus/mm-bodies.el @ 93808:2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Mon, 07 Apr 2008 01:58:55 +0000 |
parents | f154591879d5 |
children | f42ef85caf91 |
rev | line source |
---|---|
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
1 ;;; mm-bodies.el --- Functions for decoding MIME things |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
2 |
64754
fafd692d1e40
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64736
diff
changeset
|
3 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
79708 | 4 ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
31717 | 5 |
6 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> | |
7 ;; MORIOKA Tomohiko <morioka@jaist.ac.jp> | |
8 ;; This file is part of GNU Emacs. | |
9 | |
10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
11 ;; it under the terms of the GNU General Public License as published by | |
78224
24202b793a08
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
75347
diff
changeset
|
12 ;; the Free Software Foundation; either version 3, or (at your option) |
31717 | 13 ;; any later version. |
14 | |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
64085 | 22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
23 ;; Boston, MA 02110-1301, USA. | |
31717 | 24 |
25 ;;; Commentary: | |
26 | |
27 ;;; Code: | |
28 | |
87244
dac02fccd9a7
Add declare-function compatibility definition.
Glenn Morris <rgm@gnu.org>
parents:
86154
diff
changeset
|
29 ;; For Emacs < 22.2. |
31717 | 30 (eval-and-compile |
87244
dac02fccd9a7
Add declare-function compatibility definition.
Glenn Morris <rgm@gnu.org>
parents:
86154
diff
changeset
|
31 (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) |
31717 | 32 |
33 (require 'mm-util) | |
34 (require 'rfc2047) | |
32209
cbbde5b20af5
Require mm-uu, Don't require qp, uudecode.
Dave Love <fx@gnu.org>
parents:
31717
diff
changeset
|
35 (require 'mm-encode) |
31717 | 36 |
86154 | 37 (defvar mm-uu-yenc-decode-function) |
38 (defvar mm-uu-decode-function) | |
39 (defvar mm-uu-binhex-decode-function) | |
40 | |
57243
c5e16264557d
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents:
56927
diff
changeset
|
41 ;; 8bit treatment gets any char except: 0x32 - 0x7f, LF, TAB, BEL, |
31717 | 42 ;; BS, vertical TAB, form feed, and ^_ |
57243
c5e16264557d
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents:
56927
diff
changeset
|
43 ;; |
c5e16264557d
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents:
56927
diff
changeset
|
44 ;; Note that CR is *not* included, as that would allow a non-paired CR |
c5e16264557d
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents:
56927
diff
changeset
|
45 ;; in the body contrary to RFC 2822: |
c5e16264557d
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents:
56927
diff
changeset
|
46 ;; |
c5e16264557d
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents:
56927
diff
changeset
|
47 ;; - CR and LF MUST only occur together as CRLF; they MUST NOT |
c5e16264557d
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents:
56927
diff
changeset
|
48 ;; appear independently in the body. |
c5e16264557d
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents:
56927
diff
changeset
|
49 |
c5e16264557d
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Miles Bader <miles@gnu.org>
parents:
56927
diff
changeset
|
50 (defvar mm-7bit-chars "\x20-\x7f\n\t\x7\x8\xb\xc\x1f") |
31717 | 51 |
52 (defcustom mm-body-charset-encoding-alist | |
53 '((iso-2022-jp . 7bit) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
54 (iso-2022-jp-2 . 7bit) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
55 ;; We MUST encode UTF-16 because it can contain \0's which is |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
56 ;; known to break servers. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
57 ;; Note: UTF-16 variants are invalid for text parts [RFC 2781], |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
58 ;; so this can't happen :-/. |
70052
261c2dbe91d2
* mm-util.el (mm-charset-synonym-alist): Improve doc string.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
68287
diff
changeset
|
59 ;; PPS: Yes, it can happen if the user specifies UTF-16 in the MML |
261c2dbe91d2
* mm-util.el (mm-charset-synonym-alist): Improve doc string.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
68287
diff
changeset
|
60 ;; markup. - jh. |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
61 (utf-16 . base64) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
62 (utf-16be . base64) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
63 (utf-16le . base64)) |
31717 | 64 "Alist of MIME charsets to encodings. |
65 Valid encodings are `7bit', `8bit', `quoted-printable' and `base64'." | |
66 :type '(repeat (cons (symbol :tag "charset") | |
67 (choice :tag "encoding" | |
68 (const 7bit) | |
69 (const 8bit) | |
70 (const quoted-printable) | |
71 (const base64)))) | |
72 :group 'mime) | |
73 | |
87244
dac02fccd9a7
Add declare-function compatibility definition.
Glenn Morris <rgm@gnu.org>
parents:
86154
diff
changeset
|
74 (autoload 'message-options-get "message") |
dac02fccd9a7
Add declare-function compatibility definition.
Glenn Morris <rgm@gnu.org>
parents:
86154
diff
changeset
|
75 (declare-function message-options-set "message" (symbol value)) |
dac02fccd9a7
Add declare-function compatibility definition.
Glenn Morris <rgm@gnu.org>
parents:
86154
diff
changeset
|
76 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
77 (defun mm-encode-body (&optional charset) |
31717 | 78 "Encode a body. |
79 Should be called narrowed to the body that is to be encoded. | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
80 If there is more than one non-ASCII MULE charset in the body, then the |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
81 list of MULE charsets found is returned. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
82 If CHARSET is non-nil, it is used as the MIME charset to encode the body. |
31717 | 83 If successful, the MIME charset is returned. |
84 If no encoding was done, nil is returned." | |
33343
074ad4abf8e0
(mm-encode-body): Use mm-multibyte-p, don't just
Dave Love <fx@gnu.org>
parents:
32628
diff
changeset
|
85 (if (not (mm-multibyte-p)) |
31717 | 86 ;; In the non-Mule case, we search for non-ASCII chars and |
87 ;; return the value of `mail-parse-charset' if any are found. | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
88 (or charset |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
89 (save-excursion |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
90 (goto-char (point-min)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
91 (if (re-search-forward "[^\x0-\x7f]" nil t) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
92 (or mail-parse-charset |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
93 (message-options-get 'mm-encody-body-charset) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
94 (message-options-set |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
95 'mm-encody-body-charset |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
96 (mm-read-coding-system "Charset used in the article: "))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
97 ;; The logic in `mml-generate-mime-1' confirms that it's OK |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
98 ;; to return nil here. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
99 nil))) |
31717 | 100 (save-excursion |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
101 (if charset |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
102 (progn |
64736
f62cd60b99ba
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-513
Miles Bader <miles@gnu.org>
parents:
64085
diff
changeset
|
103 (mm-encode-coding-region (point-min) (point-max) |
f62cd60b99ba
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-513
Miles Bader <miles@gnu.org>
parents:
64085
diff
changeset
|
104 (mm-charset-to-coding-system charset)) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
105 charset) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
106 (goto-char (point-min)) |
92153
37d6263f580b
Revert removal of `mm-hack-charsets' in Gnus
Miles Bader <miles@gnu.org>
parents:
91327
diff
changeset
|
107 (let ((charsets (mm-find-mime-charset-region (point-min) (point-max) |
37d6263f580b
Revert removal of `mm-hack-charsets' in Gnus
Miles Bader <miles@gnu.org>
parents:
91327
diff
changeset
|
108 mm-hack-charsets))) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
109 (cond |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
110 ;; No encoding. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
111 ((null charsets) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
112 nil) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
113 ;; Too many charsets. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
114 ((> (length charsets) 1) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
115 charsets) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
116 ;; We encode. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
117 (t |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
118 (prog1 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
119 (setq charset (car charsets)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
120 (mm-encode-coding-region (point-min) (point-max) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
121 (mm-charset-to-coding-system charset)))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
122 )))))) |
31717 | 123 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
124 (defun mm-long-lines-p (length) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
125 "Say whether any of the lines in the buffer is longer than LENGTH." |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
126 (save-excursion |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
127 (goto-char (point-min)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
128 (end-of-line) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
129 (while (and (not (eobp)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
130 (not (> (current-column) length))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
131 (forward-line 1) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
132 (end-of-line)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
133 (and (> (current-column) length) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
134 (current-column)))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
135 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
136 (defvar message-posting-charset) |
32209
cbbde5b20af5
Require mm-uu, Don't require qp, uudecode.
Dave Love <fx@gnu.org>
parents:
31717
diff
changeset
|
137 |
31717 | 138 (defun mm-body-encoding (charset &optional encoding) |
139 "Do Content-Transfer-Encoding and return the encoding of the current buffer." | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
140 (when (stringp encoding) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
141 (setq encoding (intern (downcase encoding)))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
142 (let ((bits (mm-body-7-or-8)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
143 (longp (mm-long-lines-p 1000))) |
32209
cbbde5b20af5
Require mm-uu, Don't require qp, uudecode.
Dave Love <fx@gnu.org>
parents:
31717
diff
changeset
|
144 (require 'message) |
31717 | 145 (cond |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
146 ((and (not longp) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
147 (not (and mm-use-ultra-safe-encoding |
59188
6b0648eec44c
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-754
Miles Bader <miles@gnu.org>
parents:
57243
diff
changeset
|
148 (or (save-excursion (re-search-forward " $" nil t)) |
6b0648eec44c
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-754
Miles Bader <miles@gnu.org>
parents:
57243
diff
changeset
|
149 (save-excursion (re-search-forward "^From " nil t))))) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
150 (eq bits '7bit)) |
31717 | 151 bits) |
152 ((and (not mm-use-ultra-safe-encoding) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
153 (not longp) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
154 (not (cdr (assq charset mm-body-charset-encoding-alist))) |
31717 | 155 (or (eq t (cdr message-posting-charset)) |
156 (memq charset (cdr message-posting-charset)) | |
157 (eq charset mail-parse-charset))) | |
158 bits) | |
159 (t | |
160 (let ((encoding (or encoding | |
161 (cdr (assq charset mm-body-charset-encoding-alist)) | |
162 (mm-qp-or-base64)))) | |
163 (when mm-use-ultra-safe-encoding | |
164 (setq encoding (mm-safer-encoding encoding))) | |
165 (mm-encode-content-transfer-encoding encoding "text/plain") | |
166 encoding))))) | |
167 | |
168 (defun mm-body-7-or-8 () | |
169 "Say whether the body is 7bit or 8bit." | |
47948
bce2c13027f2
(mm-body-7-or-8): Don't special-case Mule.
Dave Love <fx@gnu.org>
parents:
38413
diff
changeset
|
170 (if (save-excursion |
bce2c13027f2
(mm-body-7-or-8): Don't special-case Mule.
Dave Love <fx@gnu.org>
parents:
38413
diff
changeset
|
171 (goto-char (point-min)) |
bce2c13027f2
(mm-body-7-or-8): Don't special-case Mule.
Dave Love <fx@gnu.org>
parents:
38413
diff
changeset
|
172 (skip-chars-forward mm-7bit-chars) |
bce2c13027f2
(mm-body-7-or-8): Don't special-case Mule.
Dave Love <fx@gnu.org>
parents:
38413
diff
changeset
|
173 (eobp)) |
bce2c13027f2
(mm-body-7-or-8): Don't special-case Mule.
Dave Love <fx@gnu.org>
parents:
38413
diff
changeset
|
174 '7bit |
bce2c13027f2
(mm-body-7-or-8): Don't special-case Mule.
Dave Love <fx@gnu.org>
parents:
38413
diff
changeset
|
175 '8bit)) |
31717 | 176 |
177 ;;; | |
178 ;;; Functions for decoding | |
179 ;;; | |
180 | |
181 (defun mm-decode-content-transfer-encoding (encoding &optional type) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
182 "Decodes buffer encoded with ENCODING, returning success status. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
183 If TYPE is `text/plain' CRLF->LF translation may occur." |
31717 | 184 (prog1 |
185 (condition-case error | |
186 (cond | |
187 ((eq encoding 'quoted-printable) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
188 (quoted-printable-decode-region (point-min) (point-max)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
189 t) |
31717 | 190 ((eq encoding 'base64) |
191 (base64-decode-region | |
192 (point-min) | |
193 ;; Some mailers insert whitespace | |
194 ;; junk at the end which | |
195 ;; base64-decode-region dislikes. | |
196 ;; Also remove possible junk which could | |
197 ;; have been added by mailing list software. | |
198 (save-excursion | |
199 (goto-char (point-min)) | |
200 (while (re-search-forward "^[\t ]*\r?\n" nil t) | |
201 (delete-region (match-beginning 0) (match-end 0))) | |
202 (goto-char (point-max)) | |
203 (when (re-search-backward "^[A-Za-z0-9+/]+=*[\t ]*$" nil t) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
204 (forward-line)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
205 (point)))) |
92431
f154591879d5
(mm-decode-content-transfer-encoding): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92153
diff
changeset
|
206 ((memq encoding '(nil 7bit 8bit binary)) |
31717 | 207 ;; Do nothing. |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
208 t) |
31717 | 209 ((memq encoding '(x-uuencode x-uue)) |
32209
cbbde5b20af5
Require mm-uu, Don't require qp, uudecode.
Dave Love <fx@gnu.org>
parents:
31717
diff
changeset
|
210 (require 'mm-uu) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
211 (funcall mm-uu-decode-function (point-min) (point-max)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
212 t) |
31717 | 213 ((eq encoding 'x-binhex) |
32209
cbbde5b20af5
Require mm-uu, Don't require qp, uudecode.
Dave Love <fx@gnu.org>
parents:
31717
diff
changeset
|
214 (require 'mm-uu) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
215 (funcall mm-uu-binhex-decode-function (point-min) (point-max)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
216 t) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
217 ((eq encoding 'x-yenc) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
218 (require 'mm-uu) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
219 (funcall mm-uu-yenc-decode-function (point-min) (point-max)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
220 ) |
31717 | 221 ((functionp encoding) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
222 (funcall encoding (point-min) (point-max)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
223 t) |
31717 | 224 (t |
225 (message "Unknown encoding %s; defaulting to 8bit" encoding))) | |
226 (error | |
227 (message "Error while decoding: %s" error) | |
228 nil)) | |
229 (when (and | |
67643
1c477099d3ac
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-676
Miles Bader <miles@gnu.org>
parents:
65342
diff
changeset
|
230 type |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
231 (memq encoding '(base64 x-uuencode x-uue x-binhex x-yenc)) |
65342
c71b1b2d2d04
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-530
Miles Bader <miles@gnu.org>
parents:
64754
diff
changeset
|
232 (string-match "\\`text/" type)) |
31717 | 233 (goto-char (point-min)) |
234 (while (search-forward "\r\n" nil t) | |
235 (replace-match "\n" t t))))) | |
236 | |
237 (defun mm-decode-body (charset &optional encoding type) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
238 "Decode the current article that has been encoded with ENCODING to CHARSET. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
239 ENCODING is a MIME content transfer encoding. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
240 CHARSET is the MIME charset with which to decode the data after transfer |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
241 decoding. If it is nil, default to `mail-parse-charset'." |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
242 (when (stringp charset) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
243 (setq charset (intern (downcase charset)))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
244 (when (or (not charset) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
245 (eq 'gnus-all mail-parse-ignored-charsets) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
246 (memq 'gnus-all mail-parse-ignored-charsets) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
247 (memq charset mail-parse-ignored-charsets)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
248 (setq charset mail-parse-charset)) |
31717 | 249 (save-excursion |
250 (when encoding | |
251 (mm-decode-content-transfer-encoding encoding type)) | |
68287
dbc43cabc13b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-5
Miles Bader <miles@gnu.org>
parents:
67643
diff
changeset
|
252 (when (and (featurep 'mule) ;; Fixme: Wrong test for unibyte session. |
dbc43cabc13b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-5
Miles Bader <miles@gnu.org>
parents:
67643
diff
changeset
|
253 (not (eq charset 'gnus-decoded))) |
70052
261c2dbe91d2
* mm-util.el (mm-charset-synonym-alist): Improve doc string.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
68287
diff
changeset
|
254 (let ((coding-system (mm-charset-to-coding-system |
261c2dbe91d2
* mm-util.el (mm-charset-synonym-alist): Improve doc string.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
68287
diff
changeset
|
255 ;; Allow overwrite using |
261c2dbe91d2
* mm-util.el (mm-charset-synonym-alist): Improve doc string.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
68287
diff
changeset
|
256 ;; `mm-charset-override-alist'. |
261c2dbe91d2
* mm-util.el (mm-charset-synonym-alist): Improve doc string.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
68287
diff
changeset
|
257 charset nil t))) |
32209
cbbde5b20af5
Require mm-uu, Don't require qp, uudecode.
Dave Love <fx@gnu.org>
parents:
31717
diff
changeset
|
258 (if (and (not coding-system) |
31717 | 259 (listp mail-parse-ignored-charsets) |
260 (memq 'gnus-unknown mail-parse-ignored-charsets)) | |
47948
bce2c13027f2
(mm-body-7-or-8): Don't special-case Mule.
Dave Love <fx@gnu.org>
parents:
38413
diff
changeset
|
261 (setq coding-system |
31717 | 262 (mm-charset-to-coding-system mail-parse-charset))) |
32209
cbbde5b20af5
Require mm-uu, Don't require qp, uudecode.
Dave Love <fx@gnu.org>
parents:
31717
diff
changeset
|
263 (when (and charset coding-system |
31717 | 264 ;; buffer-file-coding-system |
265 ;;Article buffer is nil coding system | |
266 ;;in XEmacs | |
267 (mm-multibyte-p) | |
32209
cbbde5b20af5
Require mm-uu, Don't require qp, uudecode.
Dave Love <fx@gnu.org>
parents:
31717
diff
changeset
|
268 (or (not (eq coding-system 'ascii)) |
68287
dbc43cabc13b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-5
Miles Bader <miles@gnu.org>
parents:
67643
diff
changeset
|
269 (setq coding-system mail-parse-charset))) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
270 (mm-decode-coding-region (point-min) (point-max) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
271 coding-system)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
272 (setq buffer-file-coding-system |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
273 (if (boundp 'last-coding-system-used) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
274 (symbol-value 'last-coding-system-used) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
275 coding-system)))))) |
31717 | 276 |
277 (defun mm-decode-string (string charset) | |
278 "Decode STRING with CHARSET." | |
279 (when (stringp charset) | |
280 (setq charset (intern (downcase charset)))) | |
47948
bce2c13027f2
(mm-body-7-or-8): Don't special-case Mule.
Dave Love <fx@gnu.org>
parents:
38413
diff
changeset
|
281 (when (or (not charset) |
31717 | 282 (eq 'gnus-all mail-parse-ignored-charsets) |
283 (memq 'gnus-all mail-parse-ignored-charsets) | |
284 (memq charset mail-parse-ignored-charsets)) | |
285 (setq charset mail-parse-charset)) | |
286 (or | |
287 (when (featurep 'mule) | |
70052
261c2dbe91d2
* mm-util.el (mm-charset-synonym-alist): Improve doc string.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
68287
diff
changeset
|
288 (let ((coding-system (mm-charset-to-coding-system |
261c2dbe91d2
* mm-util.el (mm-charset-synonym-alist): Improve doc string.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
68287
diff
changeset
|
289 charset |
261c2dbe91d2
* mm-util.el (mm-charset-synonym-alist): Improve doc string.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
68287
diff
changeset
|
290 ;; Allow overwrite using |
261c2dbe91d2
* mm-util.el (mm-charset-synonym-alist): Improve doc string.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
68287
diff
changeset
|
291 ;; `mm-charset-override-alist'. |
261c2dbe91d2
* mm-util.el (mm-charset-synonym-alist): Improve doc string.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
68287
diff
changeset
|
292 nil t))) |
32209
cbbde5b20af5
Require mm-uu, Don't require qp, uudecode.
Dave Love <fx@gnu.org>
parents:
31717
diff
changeset
|
293 (if (and (not coding-system) |
31717 | 294 (listp mail-parse-ignored-charsets) |
295 (memq 'gnus-unknown mail-parse-ignored-charsets)) | |
47948
bce2c13027f2
(mm-body-7-or-8): Don't special-case Mule.
Dave Love <fx@gnu.org>
parents:
38413
diff
changeset
|
296 (setq coding-system |
31717 | 297 (mm-charset-to-coding-system mail-parse-charset))) |
32209
cbbde5b20af5
Require mm-uu, Don't require qp, uudecode.
Dave Love <fx@gnu.org>
parents:
31717
diff
changeset
|
298 (when (and charset coding-system |
31717 | 299 (mm-multibyte-p) |
32209
cbbde5b20af5
Require mm-uu, Don't require qp, uudecode.
Dave Love <fx@gnu.org>
parents:
31717
diff
changeset
|
300 (or (not (eq coding-system 'ascii)) |
cbbde5b20af5
Require mm-uu, Don't require qp, uudecode.
Dave Love <fx@gnu.org>
parents:
31717
diff
changeset
|
301 (setq coding-system mail-parse-charset))) |
cbbde5b20af5
Require mm-uu, Don't require qp, uudecode.
Dave Love <fx@gnu.org>
parents:
31717
diff
changeset
|
302 (mm-decode-coding-string string coding-system)))) |
31717 | 303 string)) |
304 | |
305 (provide 'mm-bodies) | |
306 | |
92431
f154591879d5
(mm-decode-content-transfer-encoding): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92153
diff
changeset
|
307 ;; arch-tag: 41104bb6-4443-4ca9-8d5c-ff87ecf27d8d |
38413
a26d9b55abb6
Some fixes to follow coding conventions in files from Gnus.
Pavel Janík <Pavel@Janik.cz>
parents:
33343
diff
changeset
|
308 ;;; mm-bodies.el ends here |