annotate lisp/vm/vm-mime.el @ 147:e186c2b7192d xemacs-20-2

Added tag r20-2p1 for changeset 2af401a6ecca
author cvs
date Mon, 13 Aug 2007 09:34:48 +0200
parents 2af401a6ecca
children 43dd3413c7c7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1 ;;; MIME support functions
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2 ;;; Copyright (C) 1997 Kyle E. Jones
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3 ;;;
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
4 ;;; This program is free software; you can redistribute it and/or modify
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
5 ;;; it under the terms of the GNU General Public License as published by
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
6 ;;; the Free Software Foundation; either version 1, or (at your option)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
7 ;;; any later version.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
8 ;;;
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
9 ;;; This program is distributed in the hope that it will be useful,
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
10 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
11 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
12 ;;; GNU General Public License for more details.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
13 ;;;
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
14 ;;; You should have received a copy of the GNU General Public License
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
15 ;;; along with this program; if not, write to the Free Software
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
16 ;;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
17
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
18 (provide 'vm-mime)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
19
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
20 (defun vm-mime-error (&rest args)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
21 (signal 'vm-mime-error (list (apply 'format args)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
22 (error "can't return from vm-mime-error"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
23
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
24 (if (fboundp 'define-error)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
25 (define-error 'vm-mime-error "MIME error")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
26 (put 'vm-mime-error 'error-conditions '(vm-mime-error error))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
27 (put 'vm-mime-error 'error-message "MIME error"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
28
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
29 (defun vm-mm-layout-type (e) (aref e 0))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
30 (defun vm-mm-layout-qtype (e) (aref e 1))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
31 (defun vm-mm-layout-encoding (e) (aref e 2))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
32 (defun vm-mm-layout-id (e) (aref e 3))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
33 (defun vm-mm-layout-description (e) (aref e 4))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
34 (defun vm-mm-layout-disposition (e) (aref e 5))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
35 (defun vm-mm-layout-qdisposition (e) (aref e 6))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
36 (defun vm-mm-layout-header-start (e) (aref e 7))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
37 (defun vm-mm-layout-body-start (e) (aref e 8))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
38 (defun vm-mm-layout-body-end (e) (aref e 9))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
39 (defun vm-mm-layout-parts (e) (aref e 10))
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
40 (defun vm-mm-layout-cache (e) (aref e 11))
131
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
41 ;; if display of MIME part fails, error string will be here.
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
42 (defun vm-mm-layout-display-error (e) (aref e 12))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
43
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
44 (defun vm-set-mm-layout-type (e type) (aset e 0 type))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
45 (defun vm-set-mm-layout-cache (e c) (aset e 11 c))
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
46 (defun vm-set-mm-layout-display-error (e c) (aset e 12 c))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
47
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
48 (defun vm-mm-layout (m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
49 (or (vm-mime-layout-of m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
50 (progn (vm-set-mime-layout-of
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
51 m
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
52 (condition-case data
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
53 (vm-mime-parse-entity m)
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
54 (vm-mime-error (message "%s" (car (cdr data))))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
55 (vm-mime-layout-of m))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
56
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
57 (defun vm-mm-encoded-header (m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
58 (or (vm-mime-encoded-header-flag-of m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
59 (progn (setq m (vm-real-message-of m))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
60 (vm-set-mime-encoded-header-flag-of
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
61 m
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
62 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
63 (set-buffer (vm-buffer-of m))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
64 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
65 (save-restriction
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
66 (widen)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
67 (goto-char (vm-headers-of m))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
68 (or (re-search-forward vm-mime-encoded-word-regexp
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
69 (vm-text-of m) t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
70 'none)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
71 (vm-mime-encoded-header-flag-of m))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
72
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
73 (defun vm-mime-Q-decode-region (start end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
74 (let ((buffer-read-only nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
75 (subst-char-in-region start end ?_ (string-to-char " ") t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
76 (vm-mime-qp-decode-region start end)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
77
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
78 (fset 'vm-mime-B-decode-region 'vm-mime-base64-decode-region)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
79
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
80 (defun vm-mime-Q-encode-region (start end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
81 (let ((buffer-read-only nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
82 (subst-char-in-region start end (string-to-char " ") ?_ t)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
83 (vm-mime-qp-encode-region start end t)))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
84
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
85 (defun vm-mime-B-encode-region (start end)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
86 (vm-mime-base64-encode-region start end nil t))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
87
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
88 (defun vm-mime-crlf-to-lf-region (start end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
89 (let ((buffer-read-only nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
90 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
91 (save-restriction
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
92 (narrow-to-region start end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
93 (goto-char start)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
94 (while (search-forward "\r\n" nil t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
95 (delete-char -2)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
96 (insert "\n"))))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
97
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
98 (defun vm-mime-lf-to-crlf-region (start end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
99 (let ((buffer-read-only nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
100 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
101 (save-restriction
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
102 (narrow-to-region start end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
103 (goto-char start)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
104 (while (search-forward "\n" nil t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
105 (delete-char -1)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
106 (insert "\r\n"))))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
107
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
108 (defun vm-mime-charset-decode-region (charset start end)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
109 (or (markerp end) (setq end (vm-marker end)))
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
110 (cond (vm-xemacs-mule-p
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
111 (if (eq (device-type) 'x)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
112 (let ((buffer-read-only nil)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
113 (cell (cdr (vm-string-assoc
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
114 charset
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
115 vm-mime-mule-charset-to-coding-alist)))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
116 (oend (marker-position end))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
117 (opoint (point)))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
118 (if cell
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
119 (progn
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
120 (set-marker end (+ start
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
121 (or (decode-coding-region
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
122 start end (car cell))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
123 (- oend start))))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
124 (put-text-property start end 'vm-string t)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
125 (put-text-property start end 'vm-charset charset)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
126 (put-text-property start end 'vm-coding (car cell))))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
127 ;; In XEmacs 20.0 beta93 decode-coding-region moves point.
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
128 (goto-char opoint))))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
129 ((not (vm-multiple-fonts-possible-p)) nil)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
130 ((vm-string-member charset vm-mime-default-face-charsets) nil)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
131 (t
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
132 (let ((font (cdr (vm-string-assoc
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
133 charset
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
134 vm-mime-charset-font-alist)))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
135 (face (make-face (make-symbol "temp-face")))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
136 (e (vm-make-extent start end)))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
137 (put-text-property start end 'vm-string t)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
138 (put-text-property start end 'vm-charset charset)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
139 (if font
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
140 (condition-case data
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
141 (progn (set-face-font face font)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
142 (vm-set-extent-property e 'face face))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
143 (error nil)))))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
144
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
145 (defun vm-mime-transfer-decode-region (layout start end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
146 (let ((case-fold-search t) (crlf nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
147 (cond ((string-match "^base64$" (vm-mm-layout-encoding layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
148 (cond ((vm-mime-types-match "text"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
149 (car (vm-mm-layout-type layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
150 (setq crlf t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
151 ((vm-mime-types-match "message"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
152 (car (vm-mm-layout-type layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
153 (setq crlf t)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
154 (vm-mime-base64-decode-region start end crlf))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
155 ((string-match "^quoted-printable$"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
156 (vm-mm-layout-encoding layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
157 (vm-mime-qp-decode-region start end)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
158
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
159 (defun vm-mime-base64-decode-region (start end &optional crlf)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
160 (message "Decoding base64...")
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
161 (let ((work-buffer nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
162 (done nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
163 (counter 0)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
164 (bits 0)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
165 (lim 0) inputpos
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
166 (non-data-chars (concat "^=" vm-mime-base64-alphabet)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
167 (unwind-protect
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
168 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
169 (setq work-buffer (generate-new-buffer " *vm-work*"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
170 (buffer-disable-undo work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
171 (if vm-mime-base64-decoder-program
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
172 (let* ((binary-process-output t) ; any text already has CRLFs
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
173 (status (apply 'vm-run-command-on-region
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
174 start end work-buffer
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
175 vm-mime-base64-decoder-program
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
176 vm-mime-base64-decoder-switches)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
177 (if (not (eq status t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
178 (vm-mime-error "%s" (cdr status))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
179 (goto-char start)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
180 (skip-chars-forward non-data-chars end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
181 (while (not done)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
182 (setq inputpos (point))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
183 (cond
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
184 ((> (skip-chars-forward vm-mime-base64-alphabet end) 0)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
185 (setq lim (point))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
186 (while (< inputpos lim)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
187 (setq bits (+ bits
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
188 (aref vm-mime-base64-alphabet-decoding-vector
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
189 (char-after inputpos))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
190 (vm-increment counter)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
191 (vm-increment inputpos)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
192 (cond ((= counter 4)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
193 (vm-insert-char (lsh bits -16) 1 nil work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
194 (vm-insert-char (logand (lsh bits -8) 255) 1 nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
195 work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
196 (vm-insert-char (logand bits 255) 1 nil work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
197 (setq bits 0 counter 0))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
198 (t (setq bits (lsh bits 6)))))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
199 (cond
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
200 ((= (point) end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
201 (if (not (zerop counter))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
202 (vm-mime-error "at least %d bits missing at end of base64 encoding"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
203 (* (- 4 counter) 6)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
204 (setq done t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
205 ((= (char-after (point)) 61) ; 61 is ASCII equals
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
206 (setq done t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
207 (cond ((= counter 1)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
208 (vm-mime-error "at least 2 bits missing at end of base64 encoding"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
209 ((= counter 2)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
210 (vm-insert-char (lsh bits -10) 1 nil work-buffer))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
211 ((= counter 3)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
212 (vm-insert-char (lsh bits -16) 1 nil work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
213 (vm-insert-char (logand (lsh bits -8) 255)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
214 1 nil work-buffer))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
215 ((= counter 0) t)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
216 (t (skip-chars-forward non-data-chars end)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
217 (and crlf
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
218 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
219 (set-buffer work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
220 (vm-mime-crlf-to-lf-region (point-min) (point-max))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
221 (or (markerp end) (setq end (vm-marker end)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
222 (goto-char start)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
223 (insert-buffer-substring work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
224 (delete-region (point) end))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
225 (and work-buffer (kill-buffer work-buffer))))
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
226 (message "Decoding base64... done"))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
227
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
228 (defun vm-mime-base64-encode-region (start end &optional crlf B-encoding)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
229 (and (> (- end start) 200)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
230 (message "Encoding base64..."))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
231 (let ((work-buffer nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
232 (counter 0)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
233 (cols 0)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
234 (bits 0)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
235 (alphabet vm-mime-base64-alphabet)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
236 inputpos)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
237 (unwind-protect
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
238 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
239 (setq work-buffer (generate-new-buffer " *vm-work*"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
240 (buffer-disable-undo work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
241 (if crlf
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
242 (progn
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
243 (or (markerp end) (setq end (vm-marker end)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
244 (vm-mime-lf-to-crlf-region start end)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
245 (if vm-mime-base64-encoder-program
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
246 (let ((status (apply 'vm-run-command-on-region
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
247 start end work-buffer
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
248 vm-mime-base64-encoder-program
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
249 vm-mime-base64-encoder-switches)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
250 (if (not (eq status t))
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
251 (vm-mime-error "%s" (cdr status)))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
252 (if B-encoding
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
253 (progn
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
254 ;; if we're B encoding, strip out the line breaks
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
255 (goto-char (point-min))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
256 (while (search-forward "\n" nil t)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
257 (delete-char -1)))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
258 (setq inputpos start)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
259 (while (< inputpos end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
260 (setq bits (+ bits (char-after inputpos)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
261 (vm-increment counter)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
262 (cond ((= counter 3)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
263 (vm-insert-char (aref alphabet (lsh bits -18)) 1 nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
264 work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
265 (vm-insert-char (aref alphabet (logand (lsh bits -12) 63))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
266 1 nil work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
267 (vm-insert-char (aref alphabet (logand (lsh bits -6) 63))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
268 1 nil work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
269 (vm-insert-char (aref alphabet (logand bits 63)) 1 nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
270 work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
271 (setq cols (+ cols 4))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
272 (cond ((= cols 72)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
273 (setq cols 0)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
274 (if (not B-encoding)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
275 (vm-insert-char ?\n 1 nil work-buffer))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
276 (setq bits 0 counter 0))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
277 (t (setq bits (lsh bits 8))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
278 (vm-increment inputpos))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
279 ;; write out any remaining bits with appropriate padding
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
280 (if (= counter 0)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
281 nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
282 (setq bits (lsh bits (- 16 (* 8 counter))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
283 (vm-insert-char (aref alphabet (lsh bits -18)) 1 nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
284 work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
285 (vm-insert-char (aref alphabet (logand (lsh bits -12) 63))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
286 1 nil work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
287 (if (= counter 1)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
288 (vm-insert-char ?= 2 nil work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
289 (vm-insert-char (aref alphabet (logand (lsh bits -6) 63))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
290 1 nil work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
291 (vm-insert-char ?= 1 nil work-buffer)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
292 (if (> cols 0)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
293 (vm-insert-char ?\n 1 nil work-buffer)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
294 (or (markerp end) (setq end (vm-marker end)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
295 (goto-char start)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
296 (insert-buffer-substring work-buffer)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
297 (delete-region (point) end)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
298 (and (> (- end start) 200)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
299 (message "Encoding base64... done"))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
300 (- end start))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
301 (and work-buffer (kill-buffer work-buffer)))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
302
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
303 (defun vm-mime-qp-decode-region (start end)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
304 (and (> (- end start) 200)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
305 (message "Decoding quoted-printable..."))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
306 (let ((work-buffer nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
307 (buf (current-buffer))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
308 (case-fold-search nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
309 (hex-digit-alist '((?0 . 0) (?1 . 1) (?2 . 2) (?3 . 3)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
310 (?4 . 4) (?5 . 5) (?6 . 6) (?7 . 7)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
311 (?8 . 8) (?9 . 9) (?A . 10) (?B . 11)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
312 (?C . 12) (?D . 13) (?E . 14) (?F . 15)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
313 inputpos stop-point copy-point)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
314 (unwind-protect
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
315 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
316 (setq work-buffer (generate-new-buffer " *vm-work*"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
317 (buffer-disable-undo work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
318 (goto-char start)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
319 (setq inputpos start)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
320 (while (< inputpos end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
321 (skip-chars-forward "^=\n" end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
322 (setq stop-point (point))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
323 (cond ((looking-at "\n")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
324 ;; spaces or tabs before a hard line break must be ignored
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
325 (skip-chars-backward " \t")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
326 (setq copy-point (point))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
327 (goto-char stop-point))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
328 (t (setq copy-point stop-point)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
329 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
330 (set-buffer work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
331 (insert-buffer-substring buf inputpos copy-point))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
332 (cond ((= (point) end) t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
333 ((looking-at "\n")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
334 (vm-insert-char ?\n 1 nil work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
335 (forward-char))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
336 (t ;; looking at =
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
337 (forward-char)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
338 (cond ((looking-at "[0-9A-F][0-9A-F]")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
339 (vm-insert-char (+ (* (cdr (assq (char-after (point))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
340 hex-digit-alist))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
341 16)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
342 (cdr (assq (char-after
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
343 (1+ (point)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
344 hex-digit-alist)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
345 1 nil work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
346 (forward-char 2))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
347 ((looking-at "\n") ; soft line break
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
348 (forward-char))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
349 ((looking-at "\r")
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
350 ;; assume the user's goatloving
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
351 ;; delivery software didn't convert
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
352 ;; from Internet's CRLF newline
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
353 ;; convention to the local LF
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
354 ;; convention.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
355 (forward-char))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
356 ((looking-at "[ \t]")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
357 ;; garbage added in transit
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
358 (skip-chars-forward " \t" end))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
359 (t (vm-mime-error "something other than line break or hex digits after = in quoted-printable encoding")))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
360 (setq inputpos (point)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
361 (or (markerp end) (setq end (vm-marker end)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
362 (goto-char start)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
363 (insert-buffer-substring work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
364 (delete-region (point) end))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
365 (and work-buffer (kill-buffer work-buffer))))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
366 (and (> (- end start) 200)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
367 (message "Decoding quoted-printable... done")))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
368
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
369 (defun vm-mime-qp-encode-region (start end &optional Q-encoding quote-from)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
370 (and (> (- end start) 200)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
371 (message "Encoding quoted-printable..."))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
372 (let ((work-buffer nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
373 (buf (current-buffer))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
374 (cols 0)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
375 (hex-digit-alist '((?0 . 0) (?1 . 1) (?2 . 2) (?3 . 3)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
376 (?4 . 4) (?5 . 5) (?6 . 6) (?7 . 7)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
377 (?8 . 8) (?9 . 9) (?A . 10) (?B . 11)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
378 (?C . 12) (?D . 13) (?E . 14) (?F . 15)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
379 char inputpos)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
380 (unwind-protect
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
381 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
382 (setq work-buffer (generate-new-buffer " *vm-work*"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
383 (buffer-disable-undo work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
384 (setq inputpos start)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
385 (while (< inputpos end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
386 (setq char (char-after inputpos))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
387 (cond ((= char ?\n)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
388 (vm-insert-char char 1 nil work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
389 (setq cols 0))
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
390 ((and (= char 32)
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
391 (not (= (1+ inputpos) end))
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
392 (not (= ?\n (char-after (1+ inputpos)))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
393 (vm-insert-char char 1 nil work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
394 (vm-increment cols))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
395 ((or (< char 33) (> char 126) (= char 61)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
396 (and quote-from (= cols 0) (let ((case-fold-search nil))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
397 (looking-at "From "))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
398 (vm-insert-char ?= 1 nil work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
399 (vm-insert-char (car (rassq (lsh char -4) hex-digit-alist))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
400 1 nil work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
401 (vm-insert-char (car (rassq (logand char 15)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
402 hex-digit-alist))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
403 1 nil work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
404 (setq cols (+ cols 3)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
405 (t (vm-insert-char char 1 nil work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
406 (vm-increment cols)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
407 (cond ((> cols 70)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
408 (setq cols 0)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
409 (if Q-encoding
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
410 nil
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
411 (vm-insert-char ?= 1 nil work-buffer)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
412 (vm-insert-char ?\n 1 nil work-buffer))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
413 (vm-increment inputpos))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
414 (or (markerp end) (setq end (vm-marker end)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
415 (goto-char start)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
416 (insert-buffer-substring work-buffer)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
417 (delete-region (point) end)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
418 (and (> (- end start) 200)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
419 (message "Encoding quoted-printable... done"))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
420 (- end start))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
421 (and work-buffer (kill-buffer work-buffer)))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
422
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
423 (defun vm-decode-mime-message-headers (m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
424 (let ((case-fold-search t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
425 (buffer-read-only nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
426 charset encoding match-start match-end start end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
427 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
428 (goto-char (vm-headers-of m))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
429 (while (re-search-forward vm-mime-encoded-word-regexp (vm-text-of m) t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
430 (setq match-start (match-beginning 0)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
431 match-end (match-end 0)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
432 charset (buffer-substring (match-beginning 1) (match-end 1))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
433 encoding (buffer-substring (match-beginning 2) (match-end 2))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
434 start (match-beginning 3)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
435 end (vm-marker (match-end 3)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
436 ;; don't change anything if we can't display the
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
437 ;; character set properly.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
438 (if (not (vm-mime-charset-internally-displayable-p charset))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
439 nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
440 (delete-region end match-end)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
441 (condition-case data
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
442 (cond ((string-match "B" encoding)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
443 (vm-mime-B-decode-region start end))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
444 ((string-match "Q" encoding)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
445 (vm-mime-Q-decode-region start end))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
446 (t (vm-mime-error "unknown encoded word encoding, %s"
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
447 encoding)))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
448 (vm-mime-error (apply 'message (cdr data))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
449 (goto-char start)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
450 (insert "**invalid encoded word**")
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
451 (delete-region (point) end)))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
452 (vm-mime-charset-decode-region charset start end)
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
453 (delete-region match-start start))))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
454
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
455 (defun vm-decode-mime-encoded-words ()
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
456 (let ((case-fold-search t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
457 (buffer-read-only nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
458 charset encoding match-start match-end start end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
459 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
460 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
461 (while (re-search-forward vm-mime-encoded-word-regexp nil t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
462 (setq match-start (match-beginning 0)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
463 match-end (match-end 0)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
464 charset (buffer-substring (match-beginning 1) (match-end 1))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
465 encoding (buffer-substring (match-beginning 2) (match-end 2))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
466 start (match-beginning 3)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
467 end (vm-marker (match-end 3)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
468 ;; don't change anything if we can't display the
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
469 ;; character set properly.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
470 (if (not (vm-mime-charset-internally-displayable-p charset))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
471 nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
472 (delete-region end match-end)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
473 (condition-case data
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
474 (cond ((string-match "B" encoding)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
475 (vm-mime-B-decode-region start end))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
476 ((string-match "Q" encoding)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
477 (vm-mime-Q-decode-region start end))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
478 (t (vm-mime-error "unknown encoded word encoding, %s"
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
479 encoding)))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
480 (vm-mime-error (apply 'message (cdr data))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
481 (goto-char start)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
482 (insert "**invalid encoded word**")
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
483 (delete-region (point) end)))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
484 (vm-mime-charset-decode-region charset start end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
485 (delete-region match-start start))))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
486
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
487 (defun vm-decode-mime-encoded-words-in-string (string)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
488 (if (and vm-display-using-mime
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
489 (string-match vm-mime-encoded-word-regexp string))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
490 (vm-with-string-as-temp-buffer string 'vm-decode-mime-encoded-words)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
491 string ))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
492
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
493 (defun vm-reencode-mime-encoded-words ()
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
494 (let ((charset nil)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
495 start coding pos q-encoding
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
496 old-size
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
497 (case-fold-search t)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
498 (done nil))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
499 (save-excursion
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
500 (setq start (point-min))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
501 (while (not done)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
502 (setq charset (get-text-property start 'vm-charset))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
503 (setq pos (next-single-property-change start 'vm-charset))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
504 (or pos (setq pos (point-max) done t))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
505 (if charset
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
506 (progn
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
507 (if (setq coding (get-text-property start 'vm-coding))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
508 (progn
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
509 (setq old-size (buffer-size))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
510 (encode-coding-region start pos coding)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
511 (setq pos (+ pos (- (buffer-size) old-size)))))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
512 (setq pos
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
513 (+ start
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
514 (if (setq q-encoding
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
515 (string-match "^iso-8859-\\|^us-ascii"
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
516 charset))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
517 (vm-mime-Q-encode-region start pos)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
518 (vm-mime-B-encode-region start pos))))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
519 (goto-char pos)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
520 (insert "?=")
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
521 (setq pos (point))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
522 (goto-char start)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
523 (insert "=?" charset "?" (if q-encoding "Q" "B") "?")))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
524 (setq start pos)))))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
525
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
526 (defun vm-reencode-mime-encoded-words-in-string (string)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
527 (if (and vm-display-using-mime
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
528 (text-property-any 0 (length string) 'vm-string t string))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
529 (vm-with-string-as-temp-buffer string 'vm-reencode-mime-encoded-words)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
530 string ))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
531
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
532 (fset 'vm-mime-parse-content-header 'vm-parse-structured-header)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
533
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
534 (defun vm-mime-get-header-contents (header-name-regexp)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
535 (let ((contents nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
536 regexp)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
537 (setq regexp (concat "^\\(" header-name-regexp "\\)\\|\\(^$\\)"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
538 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
539 (let ((case-fold-search t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
540 (if (and (re-search-forward regexp nil t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
541 (match-beginning 1)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
542 (progn (goto-char (match-beginning 0))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
543 (vm-match-header)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
544 (vm-matched-header-contents)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
545 nil )))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
546
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
547 (defun vm-mime-parse-entity (&optional m default-type default-encoding)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
548 (let ((case-fold-search t) version type qtype encoding id description
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
549 disposition qdisposition boundary boundary-regexp start
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
550 multipart-list c-t c-t-e done p returnval)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
551 (catch 'return-value
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
552 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
553 (if m
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
554 (progn
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
555 (setq m (vm-real-message-of m))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
556 (set-buffer (vm-buffer-of m))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
557 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
558 (save-restriction
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
559 (if m
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
560 (progn
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
561 (setq version (vm-get-header-contents m "MIME-Version:")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
562 version (car (vm-mime-parse-content-header version))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
563 type (vm-get-header-contents m "Content-Type:")
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
564 qtype (vm-mime-parse-content-header type ?\; t)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
565 type (vm-mime-parse-content-header type ?\;)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
566 encoding (or (vm-get-header-contents
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
567 m "Content-Transfer-Encoding:")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
568 "7bit")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
569 encoding (car (vm-mime-parse-content-header encoding))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
570 id (vm-get-header-contents m "Content-ID:")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
571 id (car (vm-mime-parse-content-header id))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
572 description (vm-get-header-contents
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
573 m "Content-Description:")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
574 description (and description
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
575 (if (string-match "^[ \t\n]$"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
576 description)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
577 nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
578 description))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
579 disposition (vm-get-header-contents
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
580 m "Content-Disposition:")
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
581 qdisposition (and disposition
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
582 (vm-mime-parse-content-header
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
583 disposition ?\; t))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
584 disposition (and disposition
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
585 (vm-mime-parse-content-header
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
586 disposition ?\;)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
587 (widen)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
588 (narrow-to-region (vm-headers-of m) (vm-text-end-of m)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
589 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
590 (setq type (vm-mime-get-header-contents "Content-Type:")
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
591 qtype (or (vm-mime-parse-content-header type ?\; t)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
592 default-type)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
593 type (or (vm-mime-parse-content-header type ?\;)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
594 default-type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
595 encoding (or (vm-mime-get-header-contents
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
596 "Content-Transfer-Encoding:")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
597 default-encoding)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
598 encoding (car (vm-mime-parse-content-header encoding))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
599 id (vm-mime-get-header-contents "Content-ID:")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
600 id (car (vm-mime-parse-content-header id))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
601 description (vm-mime-get-header-contents
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
602 "Content-Description:")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
603 description (and description (if (string-match "^[ \t\n]+$"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
604 description)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
605 nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
606 description))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
607 disposition (vm-mime-get-header-contents
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
608 "Content-Disposition:")
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
609 qdisposition (and disposition
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
610 (vm-mime-parse-content-header
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
611 disposition ?\; t))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
612 disposition (and disposition
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
613 (vm-mime-parse-content-header
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
614 disposition ?\;))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
615 (cond ((null m) t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
616 ((null version)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
617 (throw 'return-value 'none))
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
618 ((or vm-mime-ignore-mime-version (string= version "1.0")) t)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
619 (t (vm-mime-error "Unsupported MIME version: %s" version)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
620 (cond ((and m (null type))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
621 (throw 'return-value
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
622 (vector '("text/plain" "charset=us-ascii")
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
623 '("text/plain" "charset=us-ascii")
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
624 encoding id description
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
625 disposition qdisposition
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
626 (vm-headers-of m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
627 (vm-text-of m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
628 (vm-text-end-of m)
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
629 nil nil nil )))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
630 ((null type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
631 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
632 (or (re-search-forward "^\n\\|\n\\'" nil t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
633 (vm-mime-error "MIME part missing header/body separator line"))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
634 (vector default-type default-type
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
635 encoding id description
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
636 disposition qdisposition
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
637 (vm-marker (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
638 (vm-marker (point))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
639 (vm-marker (point-max))
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
640 nil nil nil ))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
641 ((null (string-match "[^/ ]+/[^/ ]+" (car type)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
642 (vm-mime-error "Malformed MIME content type: %s" (car type)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
643 ((and (string-match "^multipart/\\|^message/" (car type))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
644 (null (string-match "^\\(7bit\\|8bit\\|binary\\)$"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
645 encoding)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
646 (vm-mime-error "Opaque transfer encoding used with multipart or message type: %s, %s" (car type) encoding))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
647 ((and (string-match "^message/partial$" (car type))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
648 (null (string-match "^7bit$" encoding)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
649 (vm-mime-error "Non-7BIT transfer encoding used with message/partial message: %s" encoding))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
650 ((string-match "^multipart/digest" (car type))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
651 (setq c-t '("message/rfc822")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
652 c-t-e "7bit"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
653 ((string-match "^multipart/" (car type))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
654 (setq c-t '("text/plain" "charset=us-ascii")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
655 c-t-e "7bit")) ; below
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
656 ((string-match "^message/\\(rfc822\\|news\\)" (car type))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
657 (setq c-t '("text/plain" "charset=us-ascii")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
658 c-t-e "7bit")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
659 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
660 (or (re-search-forward "^\n\\|\n\\'" nil t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
661 (vm-mime-error "MIME part missing header/body separator line"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
662 (throw 'return-value
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
663 (vector type qtype encoding id description
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
664 disposition qdisposition
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
665 (vm-marker (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
666 (vm-marker (point))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
667 (vm-marker (point-max))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
668 (list
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
669 (save-restriction
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
670 (narrow-to-region (point) (point-max))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
671 (vm-mime-parse-entity-safe nil c-t
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
672 c-t-e)))
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
673 nil nil )))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
674 (t
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
675 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
676 (or (re-search-forward "^\n\\|\n\\'" nil t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
677 (vm-mime-error "MIME part missing header/body separator line"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
678 (throw 'return-value
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
679 (vector type qtype encoding id description
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
680 disposition qdisposition
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
681 (vm-marker (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
682 (vm-marker (point))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
683 (vm-marker (point-max))
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
684 nil nil nil ))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
685 (setq p (cdr type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
686 boundary nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
687 (while p
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
688 (if (string-match "^boundary=" (car p))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
689 (setq boundary (car (vm-parse (car p) "=\\(.+\\)"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
690 p nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
691 (setq p (cdr p))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
692 (or boundary
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
693 (vm-mime-error
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
694 "Boundary parameter missing in %s type specification"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
695 (car type)))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
696 ;; the \' in the regexp is to "be liberal" in the
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
697 ;; face of broken software that does not add a line
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
698 ;; break after the final boundary of a nested
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
699 ;; multipart entity.
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
700 (setq boundary-regexp
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
701 (concat "^--" (regexp-quote boundary)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
702 "\\(--\\)?[ \t]*\\(\n\\|\\'\\)"))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
703 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
704 (setq start nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
705 multipart-list nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
706 done nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
707 (while (and (not done) (re-search-forward boundary-regexp nil t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
708 (cond ((null start)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
709 (setq start (match-end 0)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
710 (t
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
711 (and (match-beginning 1)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
712 (setq done t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
713 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
714 (save-restriction
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
715 (narrow-to-region start (1- (match-beginning 0)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
716 (setq start (match-end 0))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
717 (setq multipart-list
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
718 (cons (vm-mime-parse-entity-safe nil c-t c-t-e)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
719 multipart-list)))))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
720 (if (not done)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
721 (vm-mime-error "final %s boundary missing" boundary))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
722 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
723 (or (re-search-forward "^\n\\|\n\\'" nil t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
724 (vm-mime-error "MIME part missing header/body separator line"))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
725 (vector type qtype encoding id description
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
726 disposition qdisposition
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
727 (vm-marker (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
728 (vm-marker (point))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
729 (vm-marker (point-max))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
730 (nreverse multipart-list)
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
731 nil nil )))))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
732
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
733 (defun vm-mime-parse-entity-safe (&optional m c-t c-t-e)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
734 (or c-t (setq c-t '("text/plain" "charset=us-ascii")))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
735 ;; don't let subpart parse errors make the whole parse fail. use default
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
736 ;; type if the parse fails.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
737 (condition-case error-data
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
738 (vm-mime-parse-entity nil c-t c-t-e)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
739 (vm-mime-error
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
740 (let ((header (if m
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
741 (vm-headers-of m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
742 (vm-marker (point-min))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
743 (text (if m
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
744 (vm-text-of m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
745 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
746 (re-search-forward "^\n\\|\n\\'"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
747 nil 0)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
748 (vm-marker (point)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
749 (text-end (if m
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
750 (vm-text-end-of m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
751 (vm-marker (point-max)))))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
752 (vector c-t c-t
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
753 (vm-determine-proper-content-transfer-encoding text text-end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
754 nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
755 ;; cram the error message into the description slot
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
756 (car (cdr error-data))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
757 ;; mark as an attachment to improve the chance that the user
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
758 ;; will see the description.
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
759 '("attachment") '("attachment")
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
760 header
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
761 text
136
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
762 text-end
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
763 nil nil nil)))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
764
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
765 (defun vm-mime-get-xxx-parameter (layout name param-list)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
766 (let ((match-end (1+ (length name)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
767 (name-regexp (concat (regexp-quote name) "="))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
768 (case-fold-search t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
769 (done nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
770 (while (and param-list (not done))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
771 (if (and (string-match name-regexp (car param-list))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
772 (= (match-end 0) match-end))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
773 (setq done t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
774 (setq param-list (cdr param-list))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
775 (and (car param-list) (car (vm-parse (car param-list) "=\\(.*\\)")))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
776
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
777 (defun vm-mime-get-parameter (layout name)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
778 (vm-mime-get-xxx-parameter layout name (cdr (vm-mm-layout-type layout))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
779
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
780 (defun vm-mime-get-disposition-parameter (layout name)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
781 (vm-mime-get-xxx-parameter layout name
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
782 (cdr (vm-mm-layout-disposition layout))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
783
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
784 (defun vm-mime-insert-mime-body (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
785 (vm-insert-region-from-buffer (marker-buffer (vm-mm-layout-body-start layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
786 (vm-mm-layout-body-start layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
787 (vm-mm-layout-body-end layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
788
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
789 (defun vm-mime-insert-mime-headers (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
790 (vm-insert-region-from-buffer (marker-buffer (vm-mm-layout-body-start layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
791 (vm-mm-layout-header-start layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
792 (vm-mm-layout-body-start layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
793 (if (and (not (bobp)) (char-equal (char-after (1- (point))) ?\n))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
794 (delete-char -1)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
795
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
796 (defun vm-make-presentation-copy (m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
797 (let ((mail-buffer (current-buffer))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
798 b mm
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
799 (real-m (vm-real-message-of m))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
800 (modified (buffer-modified-p)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
801 (cond ((or (null vm-presentation-buffer-handle)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
802 (null (buffer-name vm-presentation-buffer-handle)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
803 (setq b (generate-new-buffer (concat (buffer-name)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
804 " Presentation")))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
805 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
806 (set-buffer b)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
807 (if (fboundp 'buffer-disable-undo)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
808 (buffer-disable-undo (current-buffer))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
809 ;; obfuscation to make the v19 compiler not whine
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
810 ;; about obsolete functions.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
811 (let ((x 'buffer-flush-undo))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
812 (funcall x (current-buffer))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
813 (setq mode-name "VM Presentation"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
814 major-mode 'vm-presentation-mode
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
815 vm-message-pointer (list nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
816 vm-mail-buffer mail-buffer
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
817 mode-popup-menu (and vm-use-menus vm-popup-menu-on-mouse-3
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
818 (vm-menu-support-possible-p)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
819 (vm-menu-mode-menu))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
820 ;; Default to binary file type for DOS/NT.
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
821 buffer-file-type t
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
822 ;; Tell XEmacs/MULE not to mess with the text on writes.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
823 buffer-read-only t
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
824 mode-line-format vm-mode-line-format)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
825 ;; scroll in place messes with scroll-up and this loses
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
826 (defvar scroll-in-place)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
827 (make-local-variable 'scroll-in-place)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
828 (setq scroll-in-place nil)
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
829 (and vm-xemacs-mule-p
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
830 (set-buffer-file-coding-system 'binary t))
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
831 (cond (vm-fsfemacs-19-p
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
832 ;; need to do this outside the let because
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
833 ;; loading disp-table initializes
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
834 ;; standard-display-table.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
835 (require 'disp-table)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
836 (let* ((standard-display-table
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
837 (copy-sequence standard-display-table)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
838 (standard-display-european t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
839 (setq buffer-display-table standard-display-table))))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
840 (if (and vm-frame-per-folder (vm-multiple-frames-possible-p))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
841 (vm-set-hooks-for-frame-deletion))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
842 (use-local-map vm-mode-map)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
843 (and (vm-toolbar-support-possible-p) vm-use-toolbar
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
844 (vm-toolbar-install-toolbar))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
845 (and (vm-menu-support-possible-p)
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
846 (vm-menu-install-menus))
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
847 (run-hooks 'vm-presentation-mode-hook))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
848 (setq vm-presentation-buffer-handle b)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
849 (setq b vm-presentation-buffer-handle
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
850 vm-presentation-buffer vm-presentation-buffer-handle
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
851 vm-mime-decoded nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
852 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
853 (set-buffer (vm-buffer-of real-m))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
854 (save-restriction
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
855 (widen)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
856 ;; must reference this now so that headers will be in
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
857 ;; their final position before the message is copied.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
858 ;; otherwise the vheader offset computed below will be
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
859 ;; wrong.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
860 (vm-vheaders-of real-m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
861 (set-buffer b)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
862 (widen)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
863 (let ((buffer-read-only nil)
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
864 ;; disable read-only text properties
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
865 (inhibit-read-only t)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
866 (modified (buffer-modified-p)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
867 (unwind-protect
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
868 (progn
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
869 (erase-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
870 (insert-buffer-substring (vm-buffer-of real-m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
871 (vm-start-of real-m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
872 (vm-end-of real-m)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
873 (set-buffer-modified-p modified)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
874 (setq mm (copy-sequence m))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
875 (vm-set-location-data-of mm (vm-copy (vm-location-data-of m)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
876 (set-marker (vm-start-of mm) (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
877 (set-marker (vm-headers-of mm) (+ (vm-start-of mm)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
878 (- (vm-headers-of real-m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
879 (vm-start-of real-m))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
880 (set-marker (vm-vheaders-of mm) (+ (vm-start-of mm)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
881 (- (vm-vheaders-of real-m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
882 (vm-start-of real-m))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
883 (set-marker (vm-text-of mm) (+ (vm-start-of mm)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
884 (- (vm-text-of real-m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
885 (vm-start-of real-m))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
886 (set-marker (vm-text-end-of mm) (+ (vm-start-of mm)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
887 (- (vm-text-end-of real-m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
888 (vm-start-of real-m))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
889 (set-marker (vm-end-of mm) (+ (vm-start-of mm)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
890 (- (vm-end-of real-m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
891 (vm-start-of real-m))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
892 (setcar vm-message-pointer mm)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
893
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
894 (fset 'vm-presentation-mode 'vm-mode)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
895 (put 'vm-presentation-mode 'mode-class 'special)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
896
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
897 (defvar buffer-file-coding-system)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
898
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
899 (defun vm-determine-proper-charset (beg end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
900 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
901 (save-restriction
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
902 (narrow-to-region beg end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
903 (catch 'done
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
904 (goto-char (point-min))
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
905 (if vm-xemacs-mule-p
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
906 (let ((charsets (delq 'ascii (charsets-in-region beg end))))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
907 (cond ((null charsets)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
908 "us-ascii")
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
909 ((cdr charsets)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
910 (or (car (cdr
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
911 (assq (coding-system-name
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
912 buffer-file-coding-system)
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
913 vm-mime-mule-coding-to-charset-alist)))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
914 "iso-2022-jp"))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
915 (t
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
916 (or (car (cdr
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
917 (assoc
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
918 (car charsets)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
919 vm-mime-mule-charset-to-charset-alist)))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
920 "unknown"))))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
921 (and (re-search-forward "[^\000-\177]" nil t)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
922 (throw 'done (or vm-mime-8bit-composition-charset
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
923 "iso-8859-1")))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
924 (throw 'done "us-ascii"))))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
925
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
926 (defun vm-determine-proper-content-transfer-encoding (beg end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
927 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
928 (save-restriction
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
929 (narrow-to-region beg end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
930 (catch 'done
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
931 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
932 (and (re-search-forward "[\000\015]" nil t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
933 (throw 'done "binary"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
934
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
935 (let ((toolong nil) bol)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
936 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
937 (setq bol (point))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
938 (while (and (not (eobp)) (not toolong))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
939 (forward-line)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
940 (setq toolong (> (- (point) bol) 998)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
941 bol (point)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
942 (and toolong (throw 'done "binary")))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
943
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
944 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
945 (and (re-search-forward "[\200-\377]" nil t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
946 (throw 'done "8bit"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
947
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
948 "7bit"))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
949
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
950 (defun vm-mime-types-match (type type/subtype)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
951 (let ((case-fold-search t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
952 (cond ((string-match "/" type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
953 (if (and (string-match (regexp-quote type) type/subtype)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
954 (equal 0 (match-beginning 0))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
955 (equal (length type/subtype) (match-end 0)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
956 t
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
957 nil ))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
958 ((and (string-match (regexp-quote type) type/subtype)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
959 (equal 0 (match-beginning 0))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
960 (equal (save-match-data
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
961 (string-match "/" type/subtype (match-end 0)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
962 (match-end 0)))))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
963
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
964 (defvar native-sound-only-on-console)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
965
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
966 (defun vm-mime-can-display-internal (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
967 (let ((type (car (vm-mm-layout-type layout))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
968 (cond ((vm-mime-types-match "image/jpeg" type)
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
969 (and vm-xemacs-p
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
970 (featurep 'jpeg)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
971 (eq (device-type) 'x)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
972 ((vm-mime-types-match "image/gif" type)
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
973 (and vm-xemacs-p
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
974 (featurep 'gif)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
975 (eq (device-type) 'x)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
976 ((vm-mime-types-match "image/png" type)
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
977 (and vm-xemacs-p
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
978 (featurep 'png)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
979 (eq (device-type) 'x)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
980 ((vm-mime-types-match "image/tiff" type)
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
981 (and vm-xemacs-p
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
982 (featurep 'tiff)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
983 (eq (device-type) 'x)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
984 ((vm-mime-types-match "audio/basic" type)
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
985 (and vm-xemacs-p
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
986 (or (featurep 'native-sound)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
987 (featurep 'nas-sound))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
988 (or (device-sound-enabled-p)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
989 (and (featurep 'native-sound)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
990 (not native-sound-only-on-console)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
991 (eq (device-type) 'x)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
992 ((vm-mime-types-match "multipart" type) t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
993 ((vm-mime-types-match "message/external-body" type) nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
994 ((vm-mime-types-match "message" type) t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
995 ((or (vm-mime-types-match "text/plain" type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
996 (vm-mime-types-match "text/enriched" type))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
997 (let ((charset (or (vm-mime-get-parameter layout "charset")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
998 "us-ascii")))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
999 (vm-mime-charset-internally-displayable-p charset)))
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1000 ((vm-mime-types-match "text/html" type)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1001 (condition-case ()
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1002 (progn (require 'w3)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1003 (fboundp 'w3-region))
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1004 (error nil)))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1005 (t nil))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1006
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1007 (defun vm-mime-can-convert (type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1008 (let ((alist vm-mime-type-converter-alist)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1009 ;; fake layout. make it the wrong length so an error will
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1010 ;; be signaled if vm-mime-can-display-internal ever asks
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1011 ;; for one of the other fields
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1012 (fake-layout (make-vector 1 (list nil)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1013 (done nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1014 (while (and alist (not done))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1015 (cond ((and (vm-mime-types-match (car (car alist)) type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1016 (or (progn
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1017 (setcar (aref fake-layout 0) (nth 1 (car alist)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1018 (vm-mime-can-display-internal fake-layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1019 (vm-mime-find-external-viewer (nth 1 (car alist)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1020 (setq done t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1021 (t (setq alist (cdr alist)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1022 (and alist (car alist))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1023
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1024 (defun vm-mime-convert-undisplayable-layout (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1025 (let ((ooo (vm-mime-can-convert (car (vm-mm-layout-type layout)))))
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1026 (message "Converting %s to %s..."
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1027 (car (vm-mm-layout-type layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1028 (nth 1 ooo))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1029 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1030 (set-buffer (generate-new-buffer " *mime object*"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1031 (setq vm-message-garbage-alist
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1032 (cons (cons (current-buffer) 'kill-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1033 vm-message-garbage-alist))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1034 (vm-mime-insert-mime-body layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1035 (vm-mime-transfer-decode-region layout (point-min) (point-max))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1036 (call-process-region (point-min) (point-max) shell-file-name
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1037 t t nil shell-command-switch (nth 2 ooo))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1038 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1039 (insert "Content-Type: " (nth 1 ooo) "\n")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1040 (insert "Content-Transfer-Encoding: binary\n\n")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1041 (set-buffer-modified-p nil)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1042 (message "Converting %s to %s... done"
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1043 (car (vm-mm-layout-type layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1044 (nth 1 ooo))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1045 (vector (list (nth 1 ooo))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1046 (list (nth 1 ooo))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1047 "binary"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1048 (vm-mm-layout-id layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1049 (vm-mm-layout-description layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1050 (vm-mm-layout-disposition layout)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1051 (vm-mm-layout-qdisposition layout)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1052 (vm-marker (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1053 (vm-marker (point))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1054 (vm-marker (point-max))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1055 nil
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1056 nil
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1057 nil))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1058
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1059 (defun vm-mime-should-display-button (layout dont-honor-content-disposition)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1060 (if (and vm-honor-mime-content-disposition
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1061 (not dont-honor-content-disposition)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1062 (vm-mm-layout-disposition layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1063 (let ((case-fold-search t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1064 (string-match "^attachment$" (car (vm-mm-layout-disposition layout))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1065 (let ((i-list vm-auto-displayed-mime-content-types)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1066 (type (car (vm-mm-layout-type layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1067 (matched nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1068 (if (eq i-list t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1069 nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1070 (while (and i-list (not matched))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1071 (if (vm-mime-types-match (car i-list) type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1072 (setq matched t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1073 (setq i-list (cdr i-list))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1074 (not matched) ))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1075
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1076 (defun vm-mime-should-display-internal (layout dont-honor-content-disposition)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1077 (if (and vm-honor-mime-content-disposition
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1078 (not dont-honor-content-disposition)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1079 (vm-mm-layout-disposition layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1080 (let ((case-fold-search t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1081 (string-match "^inline$" (car (vm-mm-layout-disposition layout))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1082 (let ((i-list vm-mime-internal-content-types)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1083 (type (car (vm-mm-layout-type layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1084 (matched nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1085 (if (eq i-list t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1086 t
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1087 (while (and i-list (not matched))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1088 (if (vm-mime-types-match (car i-list) type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1089 (setq matched t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1090 (setq i-list (cdr i-list))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1091 matched ))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1092
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1093 (defun vm-mime-find-external-viewer (type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1094 (let ((e-alist vm-mime-external-content-types-alist)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1095 (matched nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1096 (while (and e-alist (not matched))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1097 (if (and (vm-mime-types-match (car (car e-alist)) type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1098 (cdr (car e-alist)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1099 (setq matched (cdr (car e-alist)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1100 (setq e-alist (cdr e-alist))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1101 matched ))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1102 (fset 'vm-mime-should-display-external 'vm-mime-find-external-viewer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1103
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1104 (defun vm-mime-delete-button-maybe (extent)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1105 (let ((buffer-read-only))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1106 ;; if displayed MIME object should replace the button
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1107 ;; remove the button now.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1108 (cond ((vm-extent-property extent 'vm-mime-disposable)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1109 (delete-region (vm-extent-start-position extent)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1110 (vm-extent-end-position extent))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1111 (vm-detach-extent extent)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1112
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1113 (defun vm-decode-mime-message ()
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1114 "Decode the MIME objects in the current message.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1115
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1116 The first time this command is run on a message, decoding is done.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1117 The second time, buttons for all the objects are displayed instead.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1118 The third time, the raw, undecoded data is displayed.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1119
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1120 If decoding, the decoded objects might be displayed immediately, or
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1121 buttons might be displayed that you need to activate to view the
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1122 object. See the documentation for the variables
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1123
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1124 vm-auto-displayed-mime-content-types
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1125 vm-mime-internal-content-types
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1126 vm-mime-external-content-types-alist
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1127
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1128 to see how to control whether you see buttons or objects.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1129
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1130 If the variable vm-mime-display-function is set, then its value
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1131 is called as a function with no arguments, and none of the
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1132 actions mentioned in the preceding paragraphs are done. At the
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1133 time of the call, the current buffer will be the presentation
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1134 buffer for the folder and a copy of the current message will be
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1135 in the buffer. The function is expected to make the message
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1136 `MIME presentable' to the user in whatever manner it sees fit."
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1137 (interactive)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1138 (vm-follow-summary-cursor)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1139 (vm-select-folder-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1140 (vm-check-for-killed-summary)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1141 (vm-check-for-killed-presentation)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1142 (vm-error-if-folder-empty)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1143 (if (and (not vm-display-using-mime)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1144 (null vm-mime-display-function))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1145 (error "MIME display disabled, set vm-display-using-mime non-nil to enable."))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1146 (if vm-mime-display-function
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1147 (progn
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1148 (vm-make-presentation-copy (car vm-message-pointer))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1149 (set-buffer vm-presentation-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1150 (funcall vm-mime-display-function))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1151 (if vm-mime-decoded
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1152 (if (eq vm-mime-decoded 'decoded)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1153 (let ((vm-preview-read-messages nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1154 (vm-auto-decode-mime-messages t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1155 (vm-honor-mime-content-disposition nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1156 (vm-auto-displayed-mime-content-types '("multipart")))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1157 (setq vm-mime-decoded nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1158 (intern (buffer-name) vm-buffers-needing-display-update)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1159 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1160 (vm-preview-current-message))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1161 (setq vm-mime-decoded 'buttons))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1162 (let ((vm-preview-read-messages nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1163 (vm-auto-decode-mime-messages nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1164 (intern (buffer-name) vm-buffers-needing-display-update)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1165 (vm-preview-current-message)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1166 (let ((layout (vm-mm-layout (car vm-message-pointer)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1167 (m (car vm-message-pointer)))
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1168 (message "Decoding MIME message...")
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1169 (cond ((stringp layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1170 (error "Invalid MIME message: %s" layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1171 (if (vm-mime-plain-message-p m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1172 (error "Message needs no decoding."))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1173 (or vm-presentation-buffer
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1174 ;; maybe user killed it
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1175 (error "No presentation buffer."))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1176 (set-buffer vm-presentation-buffer)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1177 (if (and (interactive-p) (eq vm-system-state 'previewing))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1178 (let ((vm-display-using-mime nil))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1179 (vm-show-current-message)))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1180 (setq m (car vm-message-pointer))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1181 (vm-save-restriction
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1182 (widen)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1183 (goto-char (vm-text-of m))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1184 (let ((buffer-read-only nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1185 (modified (buffer-modified-p)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1186 (unwind-protect
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1187 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1188 (and (not (eq (vm-mm-encoded-header m) 'none))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1189 (vm-decode-mime-message-headers m))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1190 (if (vectorp layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1191 (progn
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1192 (vm-decode-mime-layout layout)
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1193 (delete-region (point) (point-max))))
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1194 (vm-energize-urls)
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1195 (vm-highlight-headers-maybe)
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1196 (vm-energize-headers-and-xfaces))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1197 (set-buffer-modified-p modified))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1198 (save-excursion (set-buffer vm-mail-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1199 (setq vm-mime-decoded 'decoded))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1200 (intern (buffer-name vm-mail-buffer) vm-buffers-needing-display-update)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1201 (vm-update-summary-and-mode-line)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1202 (message "Decoding MIME message... done"))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1203 (vm-display nil nil '(vm-decode-mime-message)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1204 '(vm-decode-mime-message reading-message)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1205
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1206 (defun vm-decode-mime-layout (layout &optional dont-honor-c-d)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1207 (let ((modified (buffer-modified-p)) type type-no-subtype (extent nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1208 (unwind-protect
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1209 (progn
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1210 (if (not (vectorp layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1211 (progn
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1212 (setq extent layout
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1213 layout (vm-extent-property extent 'vm-mime-layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1214 (goto-char (vm-extent-start-position extent))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1215 (setq type (downcase (car (vm-mm-layout-type layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1216 type-no-subtype (car (vm-parse type "\\([^/]+\\)")))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1217 (cond ((and (vm-mime-should-display-button layout dont-honor-c-d)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1218 (or (condition-case nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1219 (funcall (intern
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1220 (concat "vm-mime-display-button-"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1221 type))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1222 layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1223 (void-function nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1224 (condition-case nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1225 (funcall (intern
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1226 (concat "vm-mime-display-button-"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1227 type-no-subtype))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1228 layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1229 (void-function nil)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1230 ((and (vm-mime-should-display-internal layout dont-honor-c-d)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1231 (condition-case nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1232 (funcall (intern
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1233 (concat "vm-mime-display-internal-"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1234 type))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1235 layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1236 (void-function nil))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1237 ((vm-mime-types-match "multipart" type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1238 (or (condition-case nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1239 (funcall (intern
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1240 (concat "vm-mime-display-internal-"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1241 type))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1242 layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1243 (void-function nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1244 (vm-mime-display-internal-multipart/mixed layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1245 ((and (vm-mime-should-display-external type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1246 (vm-mime-display-external-generic layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1247 (and extent (vm-set-extent-property
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1248 extent 'vm-mime-disposable nil)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1249 ((vm-mime-can-convert type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1250 (vm-decode-mime-layout
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1251 (vm-mime-convert-undisplayable-layout layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1252 ((and (or (vm-mime-types-match "message" type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1253 (vm-mime-types-match "text" type))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1254 ;; display unmatched message and text types as
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1255 ;; text/plain.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1256 (vm-mime-display-internal-text/plain layout)))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1257 (t (and extent (vm-mime-rewrite-failed-button
131
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1258 extent
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1259 (or (vm-mm-layout-display-error layout)
131
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1260 "no external viewer defined for type")))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1261 (vm-mime-display-internal-application/octet-stream
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1262 (or extent layout))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1263 (and extent (vm-mime-delete-button-maybe extent)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1264 (set-buffer-modified-p modified)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1265 t )
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1266
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1267 (defun vm-mime-display-button-text (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1268 (vm-mime-display-button-xxxx layout t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1269
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1270 (defun vm-mime-display-internal-text/html (layout)
131
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1271 (if (fboundp 'w3-region)
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1272 (let ((buffer-read-only nil)
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1273 (work-buffer nil))
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1274 (message "Inlining text/html, be patient...")
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1275 ;; w3-region is not as tame as we would like.
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1276 ;; make sure the yoke is firmly attached.
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1277 (unwind-protect
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1278 (progn
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1279 (save-excursion
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1280 (set-buffer (setq work-buffer
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1281 (generate-new-buffer " *workbuf*")))
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1282 (vm-mime-insert-mime-body layout)
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1283 (vm-mime-transfer-decode-region layout (point-min) (point-max))
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1284 (save-excursion
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1285 (save-window-excursion
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1286 (w3-region (point-min) (point-max)))))
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1287 (insert-buffer-substring work-buffer))
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1288 (and work-buffer (kill-buffer work-buffer)))
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1289 (message "Inlining text/html... done")
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1290 t )
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1291 (vm-set-mm-layout-display-error layout "Need W3 to inline HTML")
131
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1292 nil ))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1293
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1294 (defun vm-mime-display-internal-text/plain (layout &optional no-highlighting)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1295 (let ((start (point)) end old-size
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1296 (buffer-read-only nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1297 (charset (or (vm-mime-get-parameter layout "charset") "us-ascii")))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1298 (if (not (vm-mime-charset-internally-displayable-p charset))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1299 (progn
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1300 (vm-set-mm-layout-display-error
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1301 layout (concat "Undisplayable charset: " charset))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1302 nil)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1303 (vm-mime-insert-mime-body layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1304 (setq end (point-marker))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1305 (vm-mime-transfer-decode-region layout start end)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1306 (setq old-size (buffer-size))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1307 (vm-mime-charset-decode-region charset start end)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1308 (set-marker end (+ end (- (buffer-size) old-size)))
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1309 (or no-highlighting (vm-energize-urls-in-message-region start end))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1310 (goto-char end)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1311 t )))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1312
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1313 (defun vm-mime-display-internal-text/enriched (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1314 (require 'enriched)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1315 (let ((start (point)) end
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1316 (buffer-read-only nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1317 (enriched-verbose t))
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1318 (message "Decoding text/enriched, be patient...")
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1319 (vm-mime-insert-mime-body layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1320 (setq end (point-marker))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1321 (vm-mime-transfer-decode-region layout start end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1322 ;; enriched-decode expects a couple of headers at the top of
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1323 ;; the region and will remove anything that looks like a
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1324 ;; header. Put a header section here for it to eat so it
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1325 ;; won't eat message text instead.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1326 (goto-char start)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1327 (insert "Comment: You should not see this header\n\n")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1328 (enriched-decode start end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1329 (vm-energize-urls-in-message-region start end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1330 (goto-char end)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1331 (message "Decoding text/enriched... done")
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1332 t ))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1333
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1334 (defun vm-mime-display-external-generic (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1335 (let ((program-list (vm-mime-find-external-viewer
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1336 (car (vm-mm-layout-type layout))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1337 (process (nth 0 (vm-mm-layout-cache layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1338 (tempfile (nth 1 (vm-mm-layout-cache layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1339 (buffer-read-only nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1340 (start (point))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1341 end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1342 (if (and (processp process) (eq (process-status process) 'run))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1343 t
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1344 (cond ((or (null tempfile) (null (file-exists-p tempfile)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1345 (vm-mime-insert-mime-body layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1346 (setq end (point-marker))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1347 (vm-mime-transfer-decode-region layout start end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1348 (setq tempfile (vm-make-tempfile-name))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1349 (let ((buffer-file-type buffer-file-type)
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
1350 buffer-file-coding-system)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1351 ;; Tell DOS/Windows NT whether the file is binary
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1352 (setq buffer-file-type (not (vm-mime-text-type-p layout)))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1353 ;; Tell XEmacs/MULE not to mess with the bits unless
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1354 ;; this is a text type.
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1355 (if vm-xemacs-mule-p
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1356 (if (vm-mime-text-type-p layout)
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
1357 (set-buffer-file-coding-system 'no-conversion nil)
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
1358 (set-buffer-file-coding-system 'binary t)))
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1359 ;; Write an empty tempfile out to disk and set its
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1360 ;; permissions to 0600, then write the actual buffer
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1361 ;; contents to tempfile.
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1362 (write-region start start tempfile nil 0)
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1363 (set-file-modes tempfile 384)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1364 (write-region start end tempfile nil 0))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1365 (delete-region start end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1366 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1367 (vm-select-folder-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1368 (setq vm-folder-garbage-alist
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1369 (cons (cons tempfile 'delete-file)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1370 vm-folder-garbage-alist)))))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1371 (message "Launching %s..." (mapconcat 'identity program-list " "))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1372 (setq process
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1373 (apply 'start-process
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1374 (format "view %25s" (vm-mime-layout-description layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1375 nil (append program-list (list tempfile))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1376 (process-kill-without-query process t)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1377 (message "Launching %s... done" (mapconcat 'identity
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1378 program-list
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1379 " "))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1380 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1381 (vm-select-folder-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1382 (setq vm-message-garbage-alist
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1383 (cons (cons process 'delete-process)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1384 vm-message-garbage-alist)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1385 (vm-set-mm-layout-cache layout (list process tempfile))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1386 t )
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1387
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1388 (defun vm-mime-display-internal-application/octet-stream (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1389 (if (vectorp layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1390 (let ((buffer-read-only nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1391 (description (vm-mm-layout-description layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1392 (vm-mime-insert-button
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1393 (format "%-35.35s [%s to save to a file]"
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1394 (vm-mime-layout-description layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1395 (if (vm-mouse-support-possible-p)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1396 "Click mouse-2"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1397 "Press RETURN"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1398 (function
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1399 (lambda (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1400 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1401 (vm-mime-display-internal-application/octet-stream layout))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1402 layout nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1403 (goto-char (vm-extent-start-position layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1404 (setq layout (vm-extent-property layout 'vm-mime-layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1405 ;; support old "name" paramater for application/octet-stream
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1406 ;; but don't override the "filename" parameter extracted from
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1407 ;; Content-Disposition, if any.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1408 (let ((default-filename
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1409 (if (vm-mime-get-disposition-parameter layout "filename")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1410 nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1411 (vm-mime-get-parameter layout "name"))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1412 (vm-mime-send-body-to-file layout default-filename)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1413 t )
126
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
1414 (fset 'vm-mime-display-button-application/octet-stream
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1415 'vm-mime-display-internal-application/octet-stream)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1416
126
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
1417 (defun vm-mime-display-button-application (layout)
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
1418 (vm-mime-display-button-xxxx layout nil))
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
1419
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1420 (defun vm-mime-display-button-image (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1421 (vm-mime-display-button-xxxx layout t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1422
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1423 (defun vm-mime-display-button-audio (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1424 (vm-mime-display-button-xxxx layout nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1425
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1426 (defun vm-mime-display-button-video (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1427 (vm-mime-display-button-xxxx layout t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1428
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1429 (defun vm-mime-display-button-message (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1430 (vm-mime-display-button-xxxx layout t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1431
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1432 (defun vm-mime-display-button-multipart (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1433 (vm-mime-display-button-xxxx layout t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1434
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1435 (defun vm-mime-display-internal-multipart/mixed (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1436 (let ((part-list (vm-mm-layout-parts layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1437 (while part-list
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1438 (vm-decode-mime-layout (car part-list))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1439 (setq part-list (cdr part-list)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1440 t ))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1441
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1442 (defun vm-mime-display-internal-multipart/alternative (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1443 (let (best-layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1444 (cond ((eq vm-mime-alternative-select-method 'best)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1445 (let ((done nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1446 (best nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1447 part-list type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1448 (setq part-list (vm-mm-layout-parts layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1449 part-list (nreverse (copy-sequence part-list)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1450 (while (and part-list (not done))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1451 (setq type (car (vm-mm-layout-type (car part-list))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1452 (if (or (vm-mime-can-display-internal (car part-list))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1453 (vm-mime-find-external-viewer type))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1454 (setq best (car part-list)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1455 done t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1456 (setq part-list (cdr part-list))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1457 (setq best-layout (or best (car (vm-mm-layout-parts layout))))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1458 ((eq vm-mime-alternative-select-method 'best-internal)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1459 (let ((done nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1460 (best nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1461 (second-best nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1462 part-list type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1463 (setq part-list (vm-mm-layout-parts layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1464 part-list (nreverse (copy-sequence part-list)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1465 (while (and part-list (not done))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1466 (setq type (car (vm-mm-layout-type (car part-list))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1467 (cond ((vm-mime-can-display-internal (car part-list))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1468 (setq best (car part-list)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1469 done t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1470 ((and (null second-best)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1471 (vm-mime-find-external-viewer type))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1472 (setq second-best (car part-list))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1473 (setq part-list (cdr part-list)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1474 (setq best-layout (or best second-best
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1475 (car (vm-mm-layout-parts layout)))))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1476 (vm-decode-mime-layout best-layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1477
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1478 (defun vm-mime-display-button-multipart/parallel (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1479 (vm-mime-insert-button
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1480 (format "%-35.35s [%s to display in parallel]"
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1481 (vm-mime-layout-description layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1482 (if (vm-mouse-support-possible-p)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1483 "Click mouse-2"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1484 "Press RETURN"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1485 (function
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1486 (lambda (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1487 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1488 (let ((vm-auto-displayed-mime-content-types t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1489 (vm-decode-mime-layout layout t)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1490 layout t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1491
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1492 (fset 'vm-mime-display-internal-multipart/parallel
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1493 'vm-mime-display-internal-multipart/mixed)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1494
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1495 (defun vm-mime-display-internal-multipart/digest (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1496 (if (vectorp layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1497 (let ((buffer-read-only nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1498 (vm-mime-insert-button
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1499 (format "%-35.35s [%s to display]"
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1500 (vm-mime-layout-description layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1501 (if (vm-mouse-support-possible-p)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1502 "Click mouse-2"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1503 "Press RETURN"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1504 (function
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1505 (lambda (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1506 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1507 (vm-mime-display-internal-multipart/digest layout))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1508 layout nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1509 (goto-char (vm-extent-start-position layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1510 (setq layout (vm-extent-property layout 'vm-mime-layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1511 (set-buffer (generate-new-buffer (format "digest from %s/%s"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1512 (buffer-name vm-mail-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1513 (vm-number-of
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1514 (car vm-message-pointer)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1515 (setq vm-folder-type vm-default-folder-type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1516 (vm-mime-burst-layout layout nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1517 (vm-save-buffer-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1518 (vm-goto-new-folder-frame-maybe 'folder)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1519 (vm-mode))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1520 ;; temp buffer, don't offer to save it.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1521 (setq buffer-offer-save nil)
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1522 (vm-display (or vm-presentation-buffer (current-buffer)) t
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
1523 (list this-command) '(vm-mode startup)))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1524 t )
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1525 (fset 'vm-mime-display-button-multipart/digest
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1526 'vm-mime-display-internal-multipart/digest)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1527
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1528 (defun vm-mime-display-button-message/rfc822 (layout)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1529 (let ((buffer-read-only nil))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1530 (vm-mime-insert-button
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1531 (format "%-35.35s [%s to display]"
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1532 (vm-mime-layout-description layout)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1533 (if (vm-mouse-support-possible-p)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1534 "Click mouse-2"
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1535 "Press RETURN"))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1536 (function
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1537 (lambda (layout)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1538 (save-excursion
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1539 (vm-mime-display-internal-message/rfc822 layout))))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1540 layout nil)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1541 (fset 'vm-mime-display-button-message/news
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1542 'vm-mime-display-button-message/rfc822)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1543
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1544 (defun vm-mime-display-internal-message/rfc822 (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1545 (if (vectorp layout)
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1546 (let ((start (point))
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1547 (buffer-read-only nil))
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1548 (vm-mime-insert-mime-headers (car (vm-mm-layout-parts layout)))
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
1549 (insert ?\n)
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1550 (save-excursion
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1551 (goto-char start)
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1552 (vm-reorder-message-headers nil vm-visible-headers
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1553 vm-invisible-header-regexp))
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
1554 (save-restriction
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
1555 (narrow-to-region start (point))
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
1556 (vm-decode-mime-encoded-words))
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
1557 (vm-mime-display-internal-multipart/mixed layout))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1558 (goto-char (vm-extent-start-position layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1559 (setq layout (vm-extent-property layout 'vm-mime-layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1560 (set-buffer (generate-new-buffer
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1561 (format "message from %s/%s"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1562 (buffer-name vm-mail-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1563 (vm-number-of
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1564 (car vm-message-pointer)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1565 (setq vm-folder-type vm-default-folder-type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1566 (vm-mime-burst-layout layout nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1567 (set-buffer-modified-p nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1568 (vm-save-buffer-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1569 (vm-goto-new-folder-frame-maybe 'folder)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1570 (vm-mode))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1571 ;; temp buffer, don't offer to save it.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1572 (setq buffer-offer-save nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1573 (vm-display (or vm-presentation-buffer (current-buffer)) t
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1574 (list this-command) '(vm-mode startup)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1575 t )
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1576 (fset 'vm-mime-display-internal-message/news
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1577 'vm-mime-display-internal-message/rfc822)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1578
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1579 (defun vm-mime-display-internal-message/partial (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1580 (if (vectorp layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1581 (let ((buffer-read-only nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1582 (number (vm-mime-get-parameter layout "number"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1583 (total (vm-mime-get-parameter layout "total")))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1584 (vm-mime-insert-button
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1585 (format "%-35.35s [%s to attempt assembly]"
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1586 (concat (vm-mime-layout-description layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1587 (and number (concat ", part " number))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1588 (and number total (concat " of " total)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1589 (if (vm-mouse-support-possible-p)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1590 "Click mouse-2"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1591 "Press RETURN"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1592 (function
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1593 (lambda (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1594 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1595 (vm-mime-display-internal-message/partial layout))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1596 layout nil))
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1597 (message "Assembling message...")
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1598 (let ((parts nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1599 (missing nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1600 (work-buffer nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1601 extent id o number total m i prev part-header-pos
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1602 p-id p-number p-total p-list)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1603 (setq extent layout
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1604 layout (vm-extent-property extent 'vm-mime-layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1605 id (vm-mime-get-parameter layout "id"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1606 (if (null id)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1607 (vm-mime-error
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1608 "message/partial message missing id parameter"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1609 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1610 (set-buffer (marker-buffer (vm-mm-layout-body-start layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1611 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1612 (save-restriction
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1613 (widen)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1614 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1615 (while (and (search-forward id nil t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1616 (setq m (vm-message-at-point)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1617 (setq o (vm-mm-layout m))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1618 (if (not (vectorp o))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1619 nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1620 (setq p-list (vm-mime-find-message/partials o id))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1621 (while p-list
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1622 (setq p-id (vm-mime-get-parameter (car p-list) "id"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1623 (setq p-total (vm-mime-get-parameter (car p-list) "total"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1624 (if (null p-total)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1625 nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1626 (setq p-total (string-to-int p-total))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1627 (if (< p-total 1)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1628 (vm-mime-error "message/partial specified part total < 0, %d" p-total))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1629 (if total
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1630 (if (not (= total p-total))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1631 (vm-mime-error "message/partial speificed total differs between parts, (%d != %d)" p-total total))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1632 (setq total p-total)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1633 (setq p-number (vm-mime-get-parameter (car p-list) "number"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1634 (if (null p-number)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1635 (vm-mime-error
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1636 "message/partial message missing number parameter"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1637 (setq p-number (string-to-int p-number))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1638 (if (< p-number 1)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1639 (vm-mime-error "message/partial part number < 0, %d"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1640 p-number))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1641 (if (and total (> p-number total))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1642 (vm-mime-error "message/partial part number greater than expected number of parts, (%d > %d)" p-number total))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1643 (setq parts (cons (list p-number (car p-list)) parts)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1644 p-list (cdr p-list))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1645 (goto-char (vm-mm-layout-body-end o))))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1646 (if (null total)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1647 (vm-mime-error "total number of parts not specified in any message/partial part"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1648 (setq parts (sort parts
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1649 (function
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1650 (lambda (p q)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1651 (< (car p)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1652 (car q))))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1653 (setq i 0
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1654 p-list parts)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1655 (while p-list
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1656 (cond ((< i (car (car p-list)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1657 (vm-increment i)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1658 (cond ((not (= i (car (car p-list))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1659 (setq missing (cons i missing)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1660 (t (setq prev p-list
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1661 p-list (cdr p-list)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1662 (t
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1663 ;; remove duplicate part
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1664 (setcdr prev (cdr p-list))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1665 (setq p-list (cdr p-list)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1666 (while (< i total)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1667 (vm-increment i)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1668 (setq missing (cons i missing)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1669 (if missing
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1670 (vm-mime-error "part%s %s%s missing"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1671 (if (cdr missing) "s" "")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1672 (mapconcat
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1673 (function identity)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1674 (nreverse (mapcar 'int-to-string
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1675 (or (cdr missing) missing)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1676 ", ")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1677 (if (cdr missing)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1678 (concat " and " (car missing))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1679 "")))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1680 (set-buffer (generate-new-buffer "assembled message"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1681 (setq vm-folder-type vm-default-folder-type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1682 (vm-mime-insert-mime-headers (car (cdr (car parts))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1683 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1684 (vm-reorder-message-headers
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1685 nil nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1686 "\\(Encrypted\\|Content-\\|MIME-Version\\|Message-ID\\|Subject\\|X-VM-\\|Status\\)")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1687 (goto-char (point-max))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1688 (setq part-header-pos (point))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1689 (while parts
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1690 (vm-mime-insert-mime-body (car (cdr (car parts))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1691 (setq parts (cdr parts)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1692 (goto-char part-header-pos)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1693 (vm-reorder-message-headers
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1694 nil '("Subject" "MIME-Version" "Content-" "Message-ID" "Encrypted") nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1695 (vm-munge-message-separators vm-folder-type (point-min) (point-max))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1696 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1697 (insert (vm-leading-message-separator))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1698 (goto-char (point-max))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1699 (insert (vm-trailing-message-separator))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1700 (set-buffer-modified-p nil)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1701 (message "Assembling message... done")
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1702 (vm-save-buffer-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1703 (vm-goto-new-folder-frame-maybe 'folder)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1704 (vm-mode))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1705 ;; temp buffer, don't offer to save it.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1706 (setq buffer-offer-save nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1707 (vm-display (or vm-presentation-buffer (current-buffer)) t
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1708 (list this-command) '(vm-mode startup)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1709 t ))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1710 (fset 'vm-mime-display-button-message/partial
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1711 'vm-mime-display-internal-message/partial)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1712
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1713 (defun vm-mime-display-internal-image-xxxx (layout feature name)
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1714 (if (and vm-xemacs-p
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1715 (featurep feature)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1716 (eq (device-type) 'x))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1717 (let ((start (point)) end tempfile g e
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1718 (buffer-read-only nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1719 (if (vm-mm-layout-cache layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1720 (setq g (vm-mm-layout-cache layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1721 (vm-mime-insert-mime-body layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1722 (setq end (point-marker))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1723 (vm-mime-transfer-decode-region layout start end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1724 (setq tempfile (vm-make-tempfile-name))
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1725 ;; Write an empty tempfile out to disk and set its
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1726 ;; permissions to 0600, then write the actual buffer
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1727 ;; contents to tempfile.
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1728 (write-region start start tempfile nil 0)
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1729 (set-file-modes tempfile 384)
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1730 ;; coding system for presentation buffer is binary so
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1731 ;; we don't need to set it here.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1732 (write-region start end tempfile nil 0)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1733 (message "Creating %s glyph..." name)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1734 (setq g (make-glyph
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1735 (list (vector feature ':file tempfile)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1736 (vector 'string
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1737 ':data
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1738 (format "[Unknown %s image encoding]\n"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1739 name)))))
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
1740 (message "")
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1741 (vm-set-mm-layout-cache layout g)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1742 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1743 (vm-select-folder-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1744 (setq vm-folder-garbage-alist
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1745 (cons (cons tempfile 'delete-file)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1746 vm-folder-garbage-alist)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1747 (delete-region start end))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1748 (if (not (bolp))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1749 (insert-char ?\n 2)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1750 (insert-char ?\n 1))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1751 (setq e (vm-make-extent (1- (point)) (point)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1752 (vm-set-extent-property e 'begin-glyph g)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1753 t )))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1754
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1755 (defun vm-mime-display-internal-image/gif (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1756 (vm-mime-display-internal-image-xxxx layout 'gif "GIF"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1757
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1758 (defun vm-mime-display-internal-image/jpeg (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1759 (vm-mime-display-internal-image-xxxx layout 'jpeg "JPEG"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1760
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1761 (defun vm-mime-display-internal-image/png (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1762 (vm-mime-display-internal-image-xxxx layout 'png "PNG"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1763
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1764 (defun vm-mime-display-internal-image/tiff (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1765 (vm-mime-display-internal-image-xxxx layout 'tiff "TIFF"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1766
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1767 (defun vm-mime-display-internal-audio/basic (layout)
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1768 (if (and vm-xemacs-p
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1769 (or (featurep 'native-sound)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1770 (featurep 'nas-sound))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1771 (or (device-sound-enabled-p)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1772 (and (featurep 'native-sound)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1773 (not native-sound-only-on-console)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1774 (eq (device-type) 'x))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1775 (let ((start (point)) end tempfile
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1776 (buffer-read-only nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1777 (if (vm-mm-layout-cache layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1778 (setq tempfile (vm-mm-layout-cache layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1779 (vm-mime-insert-mime-body layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1780 (setq end (point-marker))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1781 (vm-mime-transfer-decode-region layout start end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1782 (setq tempfile (vm-make-tempfile-name))
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1783 ;; Write an empty tempfile out to disk and set its
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1784 ;; permissions to 0600, then write the actual buffer
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1785 ;; contents to tempfile.
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1786 (write-region start start tempfile nil 0)
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1787 (set-file-modes tempfile 384)
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1788 ;; coding system for presentation buffer is binary, so
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
1789 ;; we don't need to set it here.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1790 (write-region start end tempfile nil 0)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1791 (vm-set-mm-layout-cache layout tempfile)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1792 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1793 (vm-select-folder-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1794 (setq vm-folder-garbage-alist
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1795 (cons (cons tempfile 'delete-file)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1796 vm-folder-garbage-alist)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1797 (delete-region start end))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1798 (start-itimer "audioplayer"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1799 (list 'lambda nil (list 'play-sound-file tempfile))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1800 1)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1801 t )
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1802 nil ))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1803
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1804 (defun vm-mime-display-button-xxxx (layout disposable)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1805 (let ((description (vm-mime-layout-description layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1806 (vm-mime-insert-button
131
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1807 (format "%-35.35s [%s to attempt display]"
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1808 description
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1809 (if (vm-mouse-support-possible-p) "Click mouse-2" "Press RETURN"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1810 (function
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1811 (lambda (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1812 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1813 (let ((vm-auto-displayed-mime-content-types t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1814 (vm-decode-mime-layout layout t)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1815 layout disposable)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1816 t ))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1817
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1818 (defun vm-mime-run-display-function-at-point (&optional function dispose)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1819 (interactive)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1820 ;; save excursion to keep point from moving. its motion would
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1821 ;; drag window point along, to a place arbitrarily far from
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1822 ;; where it was when the user triggered the button.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1823 (save-excursion
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1824 (cond (vm-fsfemacs-19-p
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1825 (let (o-list o (found nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1826 (setq o-list (overlays-at (point)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1827 (while (and o-list (not found))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1828 (cond ((overlay-get (car o-list) 'vm-mime-layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1829 (setq found t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1830 (funcall (or function (overlay-get (car o-list)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1831 'vm-mime-function))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1832 (car o-list))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1833 (setq o-list (cdr o-list)))))
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1834 (vm-xemacs-p
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1835 (let ((e (extent-at (point) nil 'vm-mime-layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1836 (funcall (or function (extent-property e 'vm-mime-function))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1837 e))))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1838
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1839 ;; for the karking compiler
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1840 (defvar vm-menu-mime-dispose-menu)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1841
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1842 (defun vm-mime-set-extent-glyph-for-type (e type)
126
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
1843 (if (and vm-xemacs-p
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
1844 (featurep 'xpm)
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
1845 (eq (device-type) 'x)
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
1846 (> (device-bitplanes) 7))
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1847 (let ((dir vm-image-directory)
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1848 (colorful (> (device-bitplanes) 15))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1849 (tuples
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1850 '(("text" "document-simple.xpm" "document-colorful.xpm")
126
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
1851 ("image" "mona_stamp-simple.xpm" "mona_stamp-colorful.xpm")
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1852 ("audio" "audio_stamp-simple.xpm" "audio_stamp-colorful.xpm")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1853 ("video" "film-simple.xpm" "film-colorful.xpm")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1854 ("message" "message-simple.xpm" "message-colorful.xpm")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1855 ("application" "gear-simple.xpm" "gear-colorful.xpm")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1856 ("multipart" "stuffed_box-simple.xpm"
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1857 "stuffed_box-colorful.xpm")))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1858 glyph file sym p)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1859 (setq file (catch 'done
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1860 (while tuples
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1861 (if (vm-mime-types-match (car (car tuples)) type)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1862 (throw 'done (car tuples))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1863 (setq tuples (cdr tuples))))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1864 nil)
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1865 file (and file (if colorful (nth 2 file) (nth 1 file)))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1866 sym (and file (intern file vm-image-obarray))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1867 glyph (and sym (boundp sym) (symbol-value sym))
136
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
1868 glyph (or glyph
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
1869 (and file
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
1870 (make-glyph
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
1871 (vector 'autodetect
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
1872 ':data (expand-file-name file dir))))))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
1873 (and sym (not (boundp sym)) (set sym glyph))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1874 (and glyph (set-extent-begin-glyph e glyph)))))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1875
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1876 (defun vm-mime-insert-button (caption action layout disposable)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1877 (let ((start (point)) e
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1878 (keymap (make-sparse-keymap))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1879 (buffer-read-only nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1880 (if (fboundp 'set-keymap-parents)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1881 (if (current-local-map)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1882 (set-keymap-parents keymap (list (current-local-map))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1883 (setq keymap (nconc keymap (current-local-map))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1884 (define-key keymap "\r" 'vm-mime-run-display-function-at-point)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1885 (if (and (vm-mouse-xemacs-mouse-p) vm-popup-menu-on-mouse-3)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1886 (define-key keymap 'button3 'vm-menu-popup-mime-dispose-menu))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1887 (if (not (bolp))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1888 (insert "\n"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1889 (insert caption "\n")
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1890 ;; we must use the same interface that the vm-extent functions
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1891 ;; use. if they use overlays, then we call make-overlay.
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1892 (if (eq (symbol-function 'vm-make-extent) 'make-overlay)
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1893 ;; we MUST have the five arg make-overlay. overlays must
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1894 ;; advance when text is inserted at their start position or
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1895 ;; inline text and graphics will seep into the button
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1896 ;; overlay and then be removed when the button is removed.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1897 (setq e (make-overlay start (point) nil t nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1898 (setq e (make-extent start (point)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1899 (set-extent-property e 'start-open t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1900 (set-extent-property e 'end-open t))
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1901 (vm-mime-set-extent-glyph-for-type e (car (vm-mm-layout-type layout)))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1902 ;; for emacs
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1903 (vm-set-extent-property e 'mouse-face 'highlight)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1904 (vm-set-extent-property e 'local-map keymap)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1905 ;; for xemacs
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1906 (vm-set-extent-property e 'highlight t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1907 (vm-set-extent-property e 'keymap keymap)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1908 (vm-set-extent-property e 'balloon-help 'vm-mouse-3-help)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1909 ;; for all
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1910 (vm-set-extent-property e 'vm-mime-disposable disposable)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1911 (vm-set-extent-property e 'face vm-mime-button-face)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1912 (vm-set-extent-property e 'vm-mime-layout layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1913 (vm-set-extent-property e 'vm-mime-function action)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1914
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1915 (defun vm-mime-rewrite-failed-button (button error-string)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1916 (let* ((buffer-read-only nil)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1917 (start (point)))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1918 (goto-char (vm-extent-start-position button))
131
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
1919 (insert (format "DISPLAY FAILED -- %s\n" error-string))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1920 (vm-set-extent-endpoints button start (vm-extent-end-position button))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1921 (delete-region (point) (vm-extent-end-position button))))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1922
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1923 (defun vm-mime-send-body-to-file (layout &optional default-filename)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1924 (if (not (vectorp layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1925 (setq layout (vm-extent-property layout 'vm-mime-layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1926 (or default-filename
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1927 (setq default-filename
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1928 (vm-mime-get-disposition-parameter layout "filename")))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1929 (and default-filename
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1930 (setq default-filename (file-name-nondirectory default-filename)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1931 (let ((work-buffer nil)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1932 ;; evade the XEmacs dialog box, yeccch.
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1933 (use-dialog-box nil)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1934 (dir vm-mime-attachment-save-directory)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1935 (done nil)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1936 file)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1937 (while (not done)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1938 (setq file
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1939 (read-file-name
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1940 (if default-filename
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1941 (format "Write MIME body to file (default %s): "
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1942 default-filename)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1943 "Write MIME body to file: ")
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1944 dir default-filename)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1945 file (expand-file-name file dir))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1946 (if (not (file-directory-p file))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1947 (setq done t)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1948 (if default-filename
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1949 (message "%s is a directory" file)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1950 (error "%s is a directory" file))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1951 (sit-for 2)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1952 (setq dir file
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1953 default-filename (if (string-match "/$" file)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1954 (concat file default-filename)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1955 (concat file "/" default-filename)))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1956 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1957 (unwind-protect
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1958 (progn
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1959 (setq work-buffer (generate-new-buffer " *vm-work*"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1960 (buffer-disable-undo work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1961 (set-buffer work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1962 ;; Tell DOS/Windows NT whether the file is binary
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1963 (setq buffer-file-type (not (vm-mime-text-type-p layout)))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1964 ;; Tell XEmacs/MULE not to mess with the bits unless
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1965 ;; this is a text type.
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
1966 (if vm-xemacs-mule-p
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
1967 (if (vm-mime-text-type-p layout)
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
1968 (set-buffer-file-coding-system 'no-conversion nil)
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
1969 (set-buffer-file-coding-system 'binary t)))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1970 (vm-mime-insert-mime-body layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1971 (vm-mime-transfer-decode-region layout (point-min) (point-max))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1972 (or (not (file-exists-p file))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1973 (y-or-n-p "File exists, overwrite? ")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1974 (error "Aborted"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1975 (write-region (point-min) (point-max) file nil nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1976 (and work-buffer (kill-buffer work-buffer))))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1977
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1978 (defun vm-mime-pipe-body-to-command (command layout &optional discard-output)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1979 (if (not (vectorp layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1980 (setq layout (vm-extent-property layout 'vm-mime-layout)))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
1981 (let ((output-buffer (if discard-output
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1982 0
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1983 (get-buffer-create "*Shell Command Output*")))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1984 (work-buffer nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1985 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1986 (if (bufferp output-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1987 (progn
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1988 (set-buffer output-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1989 (erase-buffer)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1990 (unwind-protect
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1991 (progn
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1992 (setq work-buffer (generate-new-buffer " *vm-work*"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1993 (buffer-disable-undo work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1994 (set-buffer work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1995 (vm-mime-insert-mime-body layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1996 (vm-mime-transfer-decode-region layout (point-min) (point-max))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1997 (let ((pop-up-windows (and pop-up-windows
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1998 (eq vm-mutable-windows t)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
1999 ;; Tell DOS/Windows NT whether the input is binary
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2000 (binary-process-input (not (vm-mime-text-type-p layout))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2001 (call-process-region (point-min) (point-max)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2002 (or shell-file-name "sh")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2003 nil output-buffer nil
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2004 shell-command-switch command)))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2005 (and work-buffer (kill-buffer work-buffer)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2006 (if (bufferp output-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2007 (progn
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2008 (set-buffer output-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2009 (if (not (zerop (buffer-size)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2010 (vm-display output-buffer t (list this-command)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2011 '(vm-pipe-message-to-command))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2012 (vm-display nil nil (list this-command)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2013 '(vm-pipe-message-to-command)))))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2014 t )
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2015
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2016 (defun vm-mime-pipe-body-to-queried-command (layout &optional discard-output)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2017 (let ((command (read-string "Pipe to command: ")))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2018 (vm-mime-pipe-body-to-command command layout discard-output)))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2019
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2020 (defun vm-mime-pipe-body-to-queried-command-discard-output (layout)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2021 (vm-mime-pipe-body-to-queried-command layout t))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2022
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2023 (defun vm-mime-send-body-to-printer (layout)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2024 (vm-mime-pipe-body-to-command (mapconcat (function identity)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2025 (nconc (list vm-print-command)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2026 vm-print-command-switches)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2027 " ")
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2028 layout))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2029
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2030 (defun vm-mime-display-body-as-text (button)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2031 (let ((vm-auto-displayed-mime-content-types '("text/plain"))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2032 (layout (copy-sequence (vm-extent-property button 'vm-mime-layout))))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2033 (vm-set-extent-property button 'vm-mime-disposable t)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2034 (vm-set-extent-property button 'vm-mime-layout layout)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2035 ;; not universally correct, but close enough.
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2036 (vm-set-mm-layout-type layout '("text/plain" "charset=us-ascii"))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2037 (goto-char (vm-extent-start-position button))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2038 (vm-decode-mime-layout button t)))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2039
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2040 (defun vm-mime-display-body-using-external-viewer (button)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2041 (let ((layout (vm-extent-property button 'vm-mime-layout)))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2042 (goto-char (vm-extent-start-position button))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2043 (if (not (vm-mime-find-external-viewer (car (vm-mm-layout-type layout))))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2044 (error "No viewer defined for type %s"
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2045 (car (vm-mm-layout-type layout)))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2046 (vm-mime-display-external-generic layout))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2047
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2048 (defun vm-mime-scrub-description (string)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2049 (let ((work-buffer nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2050 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2051 (unwind-protect
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2052 (progn
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2053 (setq work-buffer (generate-new-buffer " *vm-work*"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2054 (buffer-disable-undo work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2055 (set-buffer work-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2056 (insert string)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2057 (while (re-search-forward "[ \t\n]+" nil t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2058 (replace-match " "))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2059 (buffer-string))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2060 (and work-buffer (kill-buffer work-buffer))))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2061
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2062 (defun vm-mime-layout-description (layout)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2063 (let ((type (car (vm-mm-layout-type layout)))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2064 description name)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2065 (setq description
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2066 (if (vm-mm-layout-description layout)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2067 (vm-mime-scrub-description (vm-mm-layout-description layout))))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2068 (concat
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2069 (if description description "")
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2070 (if description ", " "")
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2071 (cond ((vm-mime-types-match "multipart/digest" type)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2072 (let ((n (length (vm-mm-layout-parts layout))))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2073 (format "digest (%d message%s)" n (if (= n 1) "" "s"))))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2074 ((vm-mime-types-match "multipart/alternative" type)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2075 "multipart alternative")
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2076 ((vm-mime-types-match "multipart" type)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2077 (let ((n (length (vm-mm-layout-parts layout))))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2078 (format "multipart message (%d part%s)" n (if (= n 1) "" "s"))))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2079 ((vm-mime-types-match "text/plain" type)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2080 (format "plain text%s"
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2081 (let ((charset (vm-mime-get-parameter layout "charset")))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2082 (if charset
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2083 (concat ", " charset)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2084 ""))))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2085 ((vm-mime-types-match "text/enriched" type)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2086 "enriched text")
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2087 ((vm-mime-types-match "text/html" type)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2088 "HTML")
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2089 ((vm-mime-types-match "image/gif" type)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2090 "GIF image")
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2091 ((vm-mime-types-match "image/jpeg" type)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2092 "JPEG image")
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2093 ((and (vm-mime-types-match "application/octet-stream" type)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2094 (setq name (vm-mime-get-parameter layout "name"))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2095 (save-match-data (not (string-match "^[ \t]*$" name))))
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2096 name)
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2097 (t type)))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2098
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2099 (defun vm-mime-layout-contains-type (layout type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2100 (if (vm-mime-types-match type (car (vm-mm-layout-type layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2101 layout
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2102 (let ((p (vm-mm-layout-parts layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2103 (result nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2104 (done nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2105 (while (and p (not done))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2106 (if (setq result (vm-mime-layout-contains-type (car p) type))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2107 (setq done t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2108 (setq p (cdr p))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2109 result )))
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
2110
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
2111 ;; breadth first traversal
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
2112 (defun vm-mime-find-digests-in-layout (layout)
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
2113 (let ((layout-list (list layout))
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
2114 layout-type
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
2115 (result nil))
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
2116 (while layout-list
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
2117 (setq layout-type (car (vm-mm-layout-type (car layout-list))))
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
2118 (cond ((string-match "^multipart/digest\\|message/\\(rfc822\\|news\\)"
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
2119 layout-type)
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
2120 (setq result (nconc result (list (car layout-list)))))
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
2121 ((vm-mime-composite-type-p layout-type)
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
2122 (setq layout-list (nconc layout-list
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
2123 (copy-sequence
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
2124 (vm-mm-layout-parts
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
2125 (car layout-list)))))))
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
2126 (setq layout-list (cdr layout-list)))
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
2127 result ))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2128
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2129 (defun vm-mime-plain-message-p (m)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2130 (save-match-data
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2131 (let ((o (vm-mm-layout m))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2132 (case-fold-search t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2133 (and (eq (vm-mm-encoded-header m) 'none)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2134 (or (not (vectorp o))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2135 (and (vm-mime-types-match "text/plain"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2136 (car (vm-mm-layout-type o)))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2137 (let* ((charset (or (vm-mime-get-parameter o "charset")
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2138 "us-ascii")))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2139 (vm-string-member charset vm-mime-default-face-charsets))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2140 (string-match "^\\(7bit\\|8bit\\|binary\\)$"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2141 (vm-mm-layout-encoding o))))))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2142
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2143 (defun vm-mime-text-type-p (layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2144 (or (vm-mime-types-match "text" (car (vm-mm-layout-type layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2145 (vm-mime-types-match "message" (car (vm-mm-layout-type layout)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2146
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2147 (defun vm-mime-charset-internally-displayable-p (name)
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
2148 (cond ((and vm-xemacs-mule-p (eq (device-type) 'x))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2149 (vm-string-assoc name vm-mime-mule-charset-to-coding-alist))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2150 ((vm-multiple-fonts-possible-p)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2151 (or (vm-string-member name vm-mime-default-face-charsets)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2152 (vm-string-assoc name vm-mime-charset-font-alist)))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2153 (t
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2154 (vm-string-member name vm-mime-default-face-charsets))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2155
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2156 (defun vm-mime-find-message/partials (layout id)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2157 (let ((list nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2158 (type (vm-mm-layout-type layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2159 (cond ((vm-mime-types-match "multipart" (car type))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2160 (let ((parts (vm-mm-layout-parts layout)) o)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2161 (while parts
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2162 (setq o (vm-mime-find-message/partials (car parts) id))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2163 (if o
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2164 (setq list (nconc o list)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2165 (setq parts (cdr parts)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2166 ((vm-mime-types-match "message/partial" (car type))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2167 (if (equal (vm-mime-get-parameter layout "id") id)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2168 (setq list (cons layout list)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2169 list ))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2170
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2171 (defun vm-message-at-point ()
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2172 (let ((mp vm-message-list)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2173 (point (point))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2174 (done nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2175 (while (and mp (not done))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2176 (if (and (>= point (vm-start-of (car mp)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2177 (<= point (vm-end-of (car mp))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2178 (setq done t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2179 (setq mp (cdr mp))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2180 (car mp)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2181
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2182 (defun vm-mime-make-multipart-boundary ()
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
2183 (let ((boundary (make-string 10 ?a))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2184 (i 0))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2185 (random t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2186 (while (< i (length boundary))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2187 (aset boundary i (aref vm-mime-base64-alphabet
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2188 (% (vm-abs (lsh (random) -8))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2189 (length vm-mime-base64-alphabet))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2190 (vm-increment i))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2191 boundary ))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2192
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2193 (defun vm-mime-attach-file (file type &optional charset description)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2194 "Attach a file to a VM composition buffer to be sent along with the message.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2195 The file is not inserted into the buffer and MIME encoded until
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2196 you execute vm-mail-send or vm-mail-send-and-exit. A visible tag
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2197 indicating the existence of the attachment is placed in the
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2198 composition buffer. You can move the attachment around or remove
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2199 it entirely with normal text editing commands. If you remove the
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2200 attachment tag, the attachment will not be sent.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2201
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2202 First argument, FILE, is the name of the file to attach. Second
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2203 argument, TYPE, is the MIME Content-Type of the file. Optional
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2204 third argument CHARSET is the character set of the attached
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2205 document. This argument is only used for text types, and it is
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2206 ignored for other types. Optional fourth argument DESCRIPTION
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2207 should be a one line description of the file.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2208
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2209 When called interactively all arguments are read from the
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2210 minibuffer.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2211
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2212 This command is for attaching files that do not have a MIME
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2213 header section at the top. For files with MIME headers, you
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2214 should use vm-mime-attach-mime-file to attach such a file. VM
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2215 will extract the content type information from the headers in
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2216 this case and not prompt you for it in the minibuffer."
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2217 (interactive
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2218 ;; protect value of last-command and this-command
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2219 (let ((last-command last-command)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2220 (this-command this-command)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2221 (charset nil)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2222 description file default-type type)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2223 (if (null vm-send-using-mime)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2224 (error "MIME attachments disabled, set vm-send-using-mime non-nil to enable."))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2225 (setq file (vm-read-file-name "Attach file: " nil nil t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2226 default-type (or (vm-mime-default-type-from-filename file)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2227 "application/octet-stream")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2228 type (completing-read
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2229 (format "Content type (default %s): "
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2230 default-type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2231 vm-mime-type-completion-alist)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2232 type (if (> (length type) 0) type default-type))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2233 (if (vm-mime-types-match "text" type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2234 (setq charset (completing-read "Character set (default US-ASCII): "
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2235 vm-mime-charset-completion-alist)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2236 charset (if (> (length charset) 0) charset)))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2237 (setq description (read-string "One line description: "))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2238 (if (string-match "^[ \t]*$" description)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2239 (setq description nil))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2240 (list file type charset description)))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2241 (if (null vm-send-using-mime)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2242 (error "MIME attachments disabled, set vm-send-using-mime non-nil to enable."))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2243 (if (file-directory-p file)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2244 (error "%s is a directory, cannot attach" file))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2245 (if (not (file-exists-p file))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2246 (error "No such file: %s" file))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2247 (if (not (file-readable-p file))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2248 (error "You don't have permission to read %s" file))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2249 (and charset (setq charset (list (concat "charset=" charset))))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2250 (and description (setq description (vm-mime-scrub-description description)))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2251 (vm-mime-attach-object file type charset description nil))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2252
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2253 (defun vm-mime-attach-mime-file (file)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2254 "Attach a MIME encoded file to a VM composition buffer to be sent
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2255 along with the message.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2256
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2257 The file is not inserted into the buffer until you execute
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2258 vm-mail-send or vm-mail-send-and-exit. A visible tag indicating
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2259 the existence of the attachment is placed in the composition
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2260 buffer. You can move the attachment around or remove it entirely
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2261 with normal text editing commands. If you remove the attachment
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2262 tag, the attachment will not be sent.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2263
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2264 The sole argument, FILE, is the name of the file to attach.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2265 When called interactively the FILE argument is read from the
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2266 minibuffer.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2267
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2268 This command is for attaching files that have a MIME
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2269 header section at the top. For files without MIME headers, you
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2270 should use vm-mime-attach-file to attach such a file. VM
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2271 will interactively query you for the file type information."
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2272 (interactive
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2273 ;; protect value of last-command and this-command
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2274 (let ((last-command last-command)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2275 (this-command this-command)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2276 file)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2277 (if (null vm-send-using-mime)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2278 (error "MIME attachments disabled, set vm-send-using-mime non-nil to enable."))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2279 (setq file (vm-read-file-name "Attach file: " nil nil t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2280 (list file)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2281 (if (null vm-send-using-mime)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2282 (error "MIME attachments disabled, set vm-send-using-mime non-nil to enable."))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2283 (if (file-directory-p file)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2284 (error "%s is a directory, cannot attach" file))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2285 (if (not (file-exists-p file))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2286 (error "No such file: %s" file))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2287 (if (not (file-readable-p file))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2288 (error "You don't have permission to read %s" file))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2289 (vm-mime-attach-object file nil nil nil t))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2290
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2291 (defun vm-mime-attach-object (object type params description mimed)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2292 (if (not (eq major-mode 'mail-mode))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2293 (error "Command must be used in a VM Mail mode buffer."))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2294 (let (start end e tag-string disposition)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2295 (if (< (point) (save-excursion (mail-text) (point)))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2296 (mail-text))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2297 (setq start (point)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2298 tag-string (format "[ATTACHMENT %s, %s]" object
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2299 (or type "MIME file")))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2300 (insert tag-string "\n")
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2301 (setq end (1- (point)))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2302 (if (and (stringp object) (not mimed))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2303 (progn
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2304 (if (or (vm-mime-types-match "application" type)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2305 (vm-mime-types-match "model" type))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2306 (setq disposition (list "attachment"))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2307 (setq disposition (list "inline")))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2308 (setq disposition (nconc disposition
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2309 (list
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2310 (concat "filename=\""
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2311 (file-name-nondirectory object)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2312 "\"")))))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2313 (setq disposition (list "unspecified")))
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
2314 (cond (vm-fsfemacs-19-p
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2315 (put-text-property start end 'front-sticky nil)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2316 (put-text-property start end 'rear-nonsticky t)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2317 ;; can't be intangible because menu clicking at a position needs
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2318 ;; to set point inside the tag so that a command can access the
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2319 ;; text properties there.
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2320 ;; (put-text-property start end 'intangible object)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2321 (put-text-property start end 'face vm-mime-button-face)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2322 (put-text-property start end 'vm-mime-type type)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2323 (put-text-property start end 'vm-mime-object object)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2324 (put-text-property start end 'vm-mime-parameters params)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2325 (put-text-property start end 'vm-mime-description description)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2326 (put-text-property start end 'vm-mime-disposition disposition)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2327 (put-text-property start end 'vm-mime-encoded mimed)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2328 (put-text-property start end 'vm-mime-object object))
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
2329 (vm-xemacs-p
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2330 (setq e (make-extent start end))
126
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
2331 (vm-mime-set-extent-glyph-for-type e (or type "text/plain"))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2332 (set-extent-property e 'start-open t)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2333 (set-extent-property e 'face vm-mime-button-face)
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2334 (set-extent-property e 'duplicable t)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2335 (let ((keymap (make-sparse-keymap)))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2336 (if vm-popup-menu-on-mouse-3
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2337 (define-key keymap 'button3
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2338 'vm-menu-popup-content-disposition-menu))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2339 (set-extent-property e 'keymap keymap)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2340 (set-extent-property e 'balloon-help 'vm-mouse-3-help))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2341 (set-extent-property e 'vm-mime-type type)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2342 (set-extent-property e 'vm-mime-object object)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2343 (set-extent-property e 'vm-mime-parameters params)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2344 (set-extent-property e 'vm-mime-description description)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2345 (set-extent-property e 'vm-mime-disposition disposition)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2346 (set-extent-property e 'vm-mime-encoded mimed)))))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2347
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2348 (defun vm-mime-attachment-disposition-at-point ()
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
2349 (cond (vm-fsfemacs-19-p
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2350 (let ((disp (get-text-property (point) 'vm-mime-disposition)))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2351 (intern (car disp))))
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
2352 (vm-xemacs-p
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2353 (let* ((e (extent-at (point) nil 'vm-mime-disposition))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2354 (disp (extent-property e 'vm-mime-disposition)))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2355 (intern (car disp))))))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2356
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2357 (defun vm-mime-set-attachment-disposition-at-point (sym)
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
2358 (cond (vm-fsfemacs-19-p
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2359 (let ((disp (get-text-property (point) 'vm-mime-disposition)))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2360 (setcar disp (symbol-name sym))))
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
2361 (vm-xemacs-p
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2362 (let* ((e (extent-at (point) nil 'vm-mime-disposition))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2363 (disp (extent-property e 'vm-mime-disposition)))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2364 (setcar disp (symbol-name sym))))))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2365
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2366 (defun vm-disallow-overlay-endpoint-insertion (overlay after start end
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2367 &optional old-size)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2368 (cond ((null after) nil)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2369 ((= start (overlay-start overlay))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2370 (move-overlay overlay end (overlay-end overlay)))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2371 ((= start (overlay-end overlay))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2372 (move-overlay overlay (overlay-start overlay) start))))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2373
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2374 (defun vm-mime-fake-attachment-overlays (start end)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2375 (let ((o-list nil)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2376 (done nil)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2377 (pos start)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
2378 object props o)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2379 (save-excursion
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2380 (save-restriction
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2381 (narrow-to-region start end)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2382 (while (not done)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2383 (setq object (get-text-property pos 'vm-mime-object))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2384 (setq pos (next-single-property-change pos 'vm-mime-object))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2385 (or pos (setq pos (point-max) done t))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2386 (if object
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2387 (progn
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2388 (setq o (make-overlay start pos))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2389 (overlay-put o 'insert-in-front-hooks
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2390 '(vm-disallow-overlay-endpoint-insertion))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2391 (overlay-put o 'insert-behind-hooks
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2392 '(vm-disallow-overlay-endpoint-insertion))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2393 (setq props (text-properties-at start))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2394 (while props
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2395 (overlay-put o (car props) (car (cdr props)))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2396 (setq props (cdr (cdr props))))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2397 (setq o-list (cons o o-list))))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2398 (setq start pos))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2399 o-list ))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2400
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2401 (defun vm-mime-default-type-from-filename (file)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2402 (let ((alist vm-mime-attachment-auto-type-alist)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2403 (case-fold-search t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2404 (done nil))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2405 (while (and alist (not done))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2406 (if (string-match (car (car alist)) file)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2407 (setq done t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2408 (setq alist (cdr alist))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2409 (and alist (cdr (car alist)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2410
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2411 (defun vm-remove-mail-mode-header-separator ()
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2412 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2413 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2414 (if (re-search-forward (concat "^" mail-header-separator "$") nil t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2415 (progn
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2416 (delete-region (match-beginning 0) (match-end 0))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2417 t )
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2418 nil )))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2419
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2420 (defun vm-add-mail-mode-header-separator ()
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2421 (save-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2422 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2423 (if (re-search-forward "^$" nil t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2424 (replace-match mail-header-separator t t))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2425
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2426 (defun vm-mime-transfer-encode-region (encoding beg end crlf)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2427 (let ((case-fold-search t)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2428 (armor-from (and vm-mime-composition-armor-from-lines
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2429 (let ((case-fold-search nil))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2430 (save-excursion
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2431 (goto-char beg)
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2432 (re-search-forward "^From " nil t))))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2433 (cond ((string-match "^binary$" encoding)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2434 (vm-mime-base64-encode-region beg end crlf)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2435 (setq encoding "base64"))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2436 ((and (not armor-from) (string-match "^7bit$" encoding)) t)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2437 ((string-match "^base64$" encoding) t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2438 ((string-match "^quoted-printable$" encoding) t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2439 ((eq vm-mime-8bit-text-transfer-encoding 'quoted-printable)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2440 (vm-mime-qp-encode-region beg end nil armor-from)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2441 (setq encoding "quoted-printable"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2442 ((eq vm-mime-8bit-text-transfer-encoding 'base64)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2443 (vm-mime-base64-encode-region beg end crlf)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2444 (setq encoding "base64"))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2445 (armor-from (vm-mime-qp-encode-region beg end nil armor-from))
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2446 ((eq vm-mime-8bit-text-transfer-encoding '8bit) t))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2447 encoding ))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2448
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2449 (defun vm-mime-transfer-encode-layout (layout)
136
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2450 (let ((list (vm-mm-layout-parts layout))
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2451 (type (car (vm-mm-layout-type layout)))
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2452 (encoding "7bit")
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2453 (vm-mime-8bit-text-transfer-encoding
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2454 vm-mime-8bit-text-transfer-encoding))
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2455 (cond ((vm-mime-composite-type-p type)
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2456 ;; MIME messages of type "message" and
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2457 ;; "multipart" are required to have a non-opaque
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2458 ;; content transfer encoding. This means that
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2459 ;; if the user only wants to send out 7bit data,
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2460 ;; then any subpart that contains 8bit data must
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2461 ;; have an opaque (qp or base64) 8->7bit
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2462 ;; conversion performed on it so that the
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2463 ;; enclosing entity can use a non-opaque
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2464 ;; encoding.
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2465 ;;
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2466 ;; message/partial requires a "7bit" encoding so
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2467 ;; force 8->7 conversion in that case.
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2468 (cond ((memq vm-mime-8bit-text-transfer-encoding
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2469 '(quoted-printable base64))
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2470 t)
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2471 ((vm-mime-types-match "message/partial" type)
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2472 (setq vm-mime-8bit-text-transfer-encoding
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2473 'quoted-printable)))
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2474 (while list
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2475 (if (equal (vm-mime-transfer-encode-layout (car list)) "8bit")
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2476 (setq encoding "8bit"))
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2477 (setq list (cdr list))))
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2478 (t
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2479 (if (and (vm-mime-types-match "message/partial" type)
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2480 (not (memq vm-mime-8bit-text-transfer-encoding
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2481 '(quoted-printable base64))))
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2482 (setq vm-mime-8bit-text-transfer-encoding
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2483 'quoted-printable))
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2484 (setq encoding
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2485 (vm-mime-transfer-encode-region (vm-mm-layout-encoding layout)
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2486 (vm-mm-layout-body-start layout)
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2487 (vm-mm-layout-body-end layout)
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2488 (vm-mime-text-type-p layout)))))
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2489 (save-excursion
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2490 (save-restriction
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2491 (goto-char (vm-mm-layout-header-start layout))
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2492 (narrow-to-region (point) (vm-mm-layout-body-start layout))
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2493 (vm-reorder-message-headers nil nil "Content-Transfer-Encoding:")
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2494 (if (not (equal encoding "7bit"))
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2495 (insert "CONTENT-TRANSFER-ENCODING: " encoding "\n"))
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2496 encoding ))))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2497
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2498 (defun vm-mime-encode-composition ()
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2499 "MIME encode the current mail composition buffer.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2500 Attachment tags added to the buffer with vm-mime-attach-file are expanded
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2501 and the approriate content-type and boundary markup information is added."
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2502 (interactive)
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
2503 (cond (vm-xemacs-mule-p
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2504 (vm-mime-xemacs-encode-composition))
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
2505 (vm-xemacs-p
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2506 (vm-mime-xemacs-encode-composition))
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
2507 (vm-fsfemacs-19-p
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2508 (vm-mime-fsfemacs-encode-composition))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2509 (t
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2510 (error "don't know how to MIME encode composition for %s"
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2511 (emacs-version)))))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2512
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2513 (defvar enriched-mode)
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2514
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2515 (defun vm-mime-xemacs-encode-composition ()
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2516 (save-restriction
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2517 (widen)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2518 (if (not (eq major-mode 'mail-mode))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2519 (error "Command must be used in a VM Mail mode buffer."))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2520 (or (null (vm-mail-mode-get-header-contents "MIME-Version:"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2521 (error "Message is already MIME encoded."))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2522 (let ((8bit nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2523 (just-one nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2524 (boundary-positions nil)
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2525 (enriched (and (boundp 'enriched-mode) enriched-mode))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2526 already-mimed layout e e-list boundary
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2527 type encoding charset params description disposition object
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2528 opoint-min)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2529 (mail-text)
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2530 (setq e-list (extent-list nil (point) (point-max))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2531 e-list (vm-delete (function
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2532 (lambda (e)
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2533 (extent-property e 'vm-mime-object)))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2534 e-list t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2535 e-list (sort e-list (function
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2536 (lambda (e1 e2)
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2537 (< (extent-end-position e1)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2538 (extent-end-position e2))))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2539 ;; If there's just one attachment and no other readable
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2540 ;; text in the buffer then make the message type just be
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2541 ;; the attachment type rather than sending a multipart
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2542 ;; message with one attachment
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2543 (setq just-one (and (= (length e-list) 1)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2544 (looking-at "[ \t\n]*")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2545 (= (match-end 0)
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2546 (extent-start-position (car e-list)))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2547 (save-excursion
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2548 (goto-char (extent-end-position (car e-list)))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2549 (looking-at "[ \t\n]*\\'"))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2550 (if (null e-list)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2551 (progn
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2552 (narrow-to-region (point) (point-max))
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2553 ;; support enriched-mode for text/enriched composition
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2554 (if enriched
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2555 (let ((enriched-initial-annotation ""))
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2556 (enriched-encode (point-min) (point-max))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2557 (setq charset (vm-determine-proper-charset (point-min)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2558 (point-max)))
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2559 (if vm-xemacs-mule-p
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2560 (encode-coding-region (point-min) (point-max)
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2561 buffer-file-coding-system))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2562 (setq encoding (vm-determine-proper-content-transfer-encoding
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2563 (point-min)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2564 (point-max))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2565 encoding (vm-mime-transfer-encode-region encoding
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2566 (point-min)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2567 (point-max)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2568 t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2569 (widen)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2570 (vm-remove-mail-mode-header-separator)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2571 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2572 (vm-reorder-message-headers
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2573 nil nil "\\(Content-Type:\\|Content-Transfer-Encoding\\|MIME-Version:\\)")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2574 (insert "MIME-Version: 1.0\n")
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2575 (if enriched
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2576 (insert "Content-Type: text/enriched; charset=" charset "\n")
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2577 (insert "Content-Type: text/plain; charset=" charset "\n"))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2578 (insert "Content-Transfer-Encoding: " encoding "\n")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2579 (vm-add-mail-mode-header-separator))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2580 (while e-list
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2581 (setq e (car e-list))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2582 (if (or just-one (= (point) (extent-start-position e)))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2583 nil
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2584 (narrow-to-region (point) (extent-start-position e))
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2585 (if enriched
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2586 (let ((enriched-initial-annotation ""))
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2587 (enriched-encode (point-min) (point-max))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2588 (setq charset (vm-determine-proper-charset (point-min)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2589 (point-max)))
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2590 (if vm-xemacs-mule-p
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2591 (encode-coding-region (point-min) (point-max)
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2592 buffer-file-coding-system))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2593 (setq encoding (vm-determine-proper-content-transfer-encoding
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2594 (point-min)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2595 (point-max))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2596 encoding (vm-mime-transfer-encode-region encoding
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2597 (point-min)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2598 (point-max)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2599 t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2600 (setq boundary-positions (cons (point-marker) boundary-positions))
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2601 (if enriched
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2602 (insert "Content-Type: text/enriched; charset=" charset "\n")
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2603 (insert "Content-Type: text/plain; charset=" charset "\n"))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2604 (insert "Content-Transfer-Encoding: " encoding "\n\n")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2605 (widen))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2606 (goto-char (extent-start-position e))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2607 (narrow-to-region (point) (point))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2608 (setq object (extent-property e 'vm-mime-object))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2609 ;; insert the object
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2610 (cond ((bufferp object)
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2611 (insert-buffer-substring object))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2612 ((stringp object)
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2613 (let ((coding-system-for-read 'no-conversion)
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2614 ;; don't let buffer-file-coding-system be changed
131
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
2615 ;; by insert-file-contents-literally. The
869e1851236b Import from CVS: tag xemacs-20-1p4
cvs
parents: 126
diff changeset
2616 ;; value we bind to it to here isn't important.
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2617 (buffer-file-coding-system 'no-conversion))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2618 (insert-file-contents-literally object))))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2619 ;; gather information about the object from the extent.
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2620 (if (setq already-mimed (extent-property e 'vm-mime-encoded))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2621 (setq layout (vm-mime-parse-entity
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2622 nil (list "text/plain" "charset=us-ascii")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2623 "7bit")
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2624 type (or (extent-property e 'vm-mime-type)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2625 (car (vm-mm-layout-type layout)))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2626 params (or (extent-property e 'vm-mime-parameters)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2627 (cdr (vm-mm-layout-qtype layout)))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2628 description (extent-property e 'vm-mime-description)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2629 disposition
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2630 (if (not
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2631 (equal
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2632 (car (extent-property e 'vm-mime-disposition))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2633 "unspecified"))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2634 (extent-property e 'vm-mime-disposition)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2635 (vm-mm-layout-qdisposition layout)))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2636 (setq type (extent-property e 'vm-mime-type)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2637 params (extent-property e 'vm-mime-parameters)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2638 description (extent-property e 'vm-mime-description)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2639 disposition
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2640 (if (not (equal
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2641 (car (extent-property e 'vm-mime-disposition))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2642 "unspecified"))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2643 (extent-property e 'vm-mime-disposition)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2644 nil)))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2645 (cond ((vm-mime-types-match "text" type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2646 (setq encoding
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2647 (vm-determine-proper-content-transfer-encoding
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2648 (if already-mimed
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2649 (vm-mm-layout-body-start layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2650 (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2651 (point-max))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2652 encoding (vm-mime-transfer-encode-region
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2653 encoding
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2654 (if already-mimed
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2655 (vm-mm-layout-body-start layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2656 (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2657 (point-max)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2658 t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2659 (setq 8bit (or 8bit (equal encoding "8bit"))))
136
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2660 ((vm-mime-composite-type-p type)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2661 (setq opoint-min (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2662 (if (not already-mimed)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2663 (setq layout (vm-mime-parse-entity
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2664 nil (list "text/plain" "charset=us-ascii")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2665 "7bit")))
136
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2666 (setq encoding (vm-mime-transfer-encode-layout layout))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2667 (setq 8bit (or 8bit (equal encoding "8bit")))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2668 (goto-char (point-max))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2669 (widen)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2670 (narrow-to-region opoint-min (point)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2671 (t
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2672 (vm-mime-base64-encode-region
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2673 (if already-mimed
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2674 (vm-mm-layout-body-start layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2675 (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2676 (point-max))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2677 (setq encoding "base64")))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2678 (if just-one
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2679 nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2680 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2681 (setq boundary-positions (cons (point-marker) boundary-positions))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2682 (if (not already-mimed)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2683 nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2684 ;; trim headers
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2685 (vm-reorder-message-headers
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2686 nil (nconc (list "Content-Disposition:" "Content-ID:")
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2687 (if description
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2688 (list "Content-Description:")
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2689 nil))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2690 nil)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2691 ;; remove header/text separator
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2692 (goto-char (1- (vm-mm-layout-body-start layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2693 (if (looking-at "\n")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2694 (delete-char 1)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2695 (insert "Content-Type: " type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2696 (if params
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2697 (if vm-mime-avoid-folding-content-type
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2698 (insert "; " (mapconcat 'identity params "; ") "\n")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2699 (insert ";\n\t" (mapconcat 'identity params ";\n\t") "\n"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2700 (insert "\n"))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2701 (and description
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2702 (insert "Content-Description: " description "\n"))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2703 (if disposition
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2704 (progn
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2705 (insert "Content-Disposition: " (car disposition))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2706 (if (cdr disposition)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2707 (insert ";\n\t" (mapconcat 'identity
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2708 (cdr disposition)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2709 ";\n\t")))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2710 (insert "\n")))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2711 (insert "Content-Transfer-Encoding: " encoding "\n\n"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2712 (goto-char (point-max))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2713 (widen)
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2714 (save-excursion
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2715 (goto-char (extent-start-position e))
30
ec9a17fef872 Import from CVS: tag r19-15b98
cvs
parents: 26
diff changeset
2716 (vm-assert (looking-at "\\[ATTACHMENT")))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2717 (delete-region (extent-start-position e)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2718 (extent-end-position e))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2719 (detach-extent e)
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2720 (if (looking-at "\n")
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2721 (delete-char 1))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2722 (setq e-list (cdr e-list)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2723 ;; handle the remaining chunk of text after the last
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2724 ;; extent, if any.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2725 (if (or just-one (= (point) (point-max)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2726 nil
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2727 (if enriched
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2728 (let ((enriched-initial-annotation ""))
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2729 (enriched-encode (point) (point-max))))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2730 (setq charset (vm-determine-proper-charset (point)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2731 (point-max)))
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2732 (if vm-xemacs-mule-p
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2733 (encode-coding-region (point) (point-max)
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2734 buffer-file-coding-system))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2735 (setq encoding (vm-determine-proper-content-transfer-encoding
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2736 (point)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2737 (point-max))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2738 encoding (vm-mime-transfer-encode-region encoding
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2739 (point)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2740 (point-max)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2741 t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2742 (setq 8bit (or 8bit (equal encoding "8bit")))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2743 (setq boundary-positions (cons (point-marker) boundary-positions))
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2744 (if enriched
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2745 (insert "Content-Type: text/enriched; charset=" charset "\n")
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2746 (insert "Content-Type: text/plain; charset=" charset "\n"))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2747 (insert "Content-Transfer-Encoding: " encoding "\n\n")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2748 (goto-char (point-max)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2749 (setq boundary (vm-mime-make-multipart-boundary))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2750 (mail-text)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2751 (while (re-search-forward (concat "^--"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2752 (regexp-quote boundary)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2753 "\\(--\\)?$")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2754 nil t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2755 (setq boundary (vm-mime-make-multipart-boundary))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2756 (mail-text))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2757 (goto-char (point-max))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2758 (or just-one (insert "\n--" boundary "--\n"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2759 (while boundary-positions
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2760 (goto-char (car boundary-positions))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2761 (insert "\n--" boundary "\n")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2762 (setq boundary-positions (cdr boundary-positions)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2763 (if (and just-one already-mimed)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2764 (progn
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2765 (goto-char (vm-mm-layout-header-start layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2766 ;; trim headers
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2767 (vm-reorder-message-headers
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2768 nil '("Content-Description:" "Content-ID:") nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2769 ;; remove header/text separator
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2770 (goto-char (1- (vm-mm-layout-body-start layout)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2771 (if (looking-at "\n")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2772 (delete-char 1))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2773 ;; copy remainder to enclosing entity's header section
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2774 (insert-buffer-substring (current-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2775 (vm-mm-layout-header-start layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2776 (vm-mm-layout-body-start layout))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2777 (delete-region (vm-mm-layout-header-start layout)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2778 (vm-mm-layout-body-start layout))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2779 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2780 (vm-remove-mail-mode-header-separator)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2781 (vm-reorder-message-headers
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2782 nil nil "\\(Content-Type:\\|MIME-Version:\\|Content-Transfer-Encoding\\)")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2783 (vm-add-mail-mode-header-separator)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2784 (insert "MIME-Version: 1.0\n")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2785 (if (not just-one)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2786 (insert (if vm-mime-avoid-folding-content-type
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2787 "Content-Type: multipart/mixed; boundary=\""
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2788 "Content-Type: multipart/mixed;\n\tboundary=\"")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2789 boundary "\"\n")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2790 (insert "Content-Type: " type)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2791 (if params
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2792 (if vm-mime-avoid-folding-content-type
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2793 (insert "; " (mapconcat 'identity params "; ") "\n")
126
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
2794 (insert ";\n\t" (mapconcat 'identity params ";\n\t") "\n"))
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
2795 (insert "\n")))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2796 (if just-one
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2797 (and description
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2798 (insert "Content-Description: " description "\n")))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2799 (if (and just-one disposition)
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2800 (progn
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2801 (insert "Content-Disposition: " (car disposition))
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2802 (if (cdr disposition)
126
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
2803 (if vm-mime-avoid-folding-content-type
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
2804 (insert "; " (mapconcat 'identity (cdr disposition) "; ")
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
2805 "\n")
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
2806 (insert ";\n\t" (mapconcat 'identity (cdr disposition)
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
2807 ";\n\t")))
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
2808 (insert "\n"))))
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
2809 (if just-one
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2810 (insert "Content-Transfer-Encoding: " encoding "\n")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2811 (if 8bit
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2812 (insert "Content-Transfer-Encoding: 8bit\n")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2813 (insert "Content-Transfer-Encoding: 7bit\n")))))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
2814
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2815 (defun vm-mime-fsfemacs-encode-composition ()
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2816 (save-restriction
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2817 (widen)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2818 (if (not (eq major-mode 'mail-mode))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2819 (error "Command must be used in a VM Mail mode buffer."))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2820 (or (null (vm-mail-mode-get-header-contents "MIME-Version:"))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2821 (error "Message is already MIME encoded."))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2822 (let ((8bit nil)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2823 (just-one nil)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2824 (boundary-positions nil)
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2825 (enriched (and (boundp 'enriched-mode) enriched-mode))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2826 already-mimed layout o o-list boundary
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2827 type encoding charset params description disposition object
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2828 opoint-min)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2829 (mail-text)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2830 (setq o-list (vm-mime-fake-attachment-overlays (point) (point-max))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2831 o-list (vm-delete (function
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2832 (lambda (o)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2833 (overlay-get o 'vm-mime-object)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2834 o-list t)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2835 o-list (sort o-list (function
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2836 (lambda (e1 e2)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2837 (< (overlay-end e1)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2838 (overlay-end e2))))))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2839 ;; If there's just one attachment and no other readable
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2840 ;; text in the buffer then make the message type just be
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2841 ;; the attachment type rather than sending a multipart
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2842 ;; message with one attachment
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2843 (setq just-one (and (= (length o-list) 1)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2844 (looking-at "[ \t\n]*")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2845 (= (match-end 0)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2846 (overlay-start (car o-list)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2847 (save-excursion
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2848 (goto-char (overlay-end (car o-list)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2849 (looking-at "[ \t\n]*\\'"))))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2850 (if (null o-list)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2851 (progn
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2852 (narrow-to-region (point) (point-max))
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2853 ;; support enriched-mode for text/enriched composition
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2854 (if enriched
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2855 (let ((enriched-initial-annotation ""))
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2856 (enriched-encode (point-min) (point-max))))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2857 (setq charset (vm-determine-proper-charset (point-min)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2858 (point-max)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2859 (setq encoding (vm-determine-proper-content-transfer-encoding
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2860 (point-min)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2861 (point-max))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2862 encoding (vm-mime-transfer-encode-region encoding
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2863 (point-min)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2864 (point-max)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2865 t))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2866 (widen)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2867 (vm-remove-mail-mode-header-separator)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2868 (goto-char (point-min))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2869 (vm-reorder-message-headers
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2870 nil nil "\\(Content-Type:\\|Content-Transfer-Encoding\\|MIME-Version:\\)")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2871 (insert "MIME-Version: 1.0\n")
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2872 (if enriched
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2873 (insert "Content-Type: text/enriched; charset=" charset "\n")
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2874 (insert "Content-Type: text/plain; charset=" charset "\n"))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2875 (insert "Content-Transfer-Encoding: " encoding "\n")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2876 (vm-add-mail-mode-header-separator))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2877 (while o-list
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2878 (setq o (car o-list))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2879 (if (or just-one (= (point) (overlay-start o)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2880 nil
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2881 (narrow-to-region (point) (overlay-start o))
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2882 ;; support enriched-mode for text/enriched composition
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2883 (if enriched
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2884 (let ((enriched-initial-annotation ""))
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2885 (save-excursion
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2886 ;; insert/delete trick needed to avoid
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2887 ;; enriched-mode tags from seeping into the
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2888 ;; attachment overlays. I really wish
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
2889 ;; front-advance / rear-advance overlay
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2890 ;; endpoint properties actually worked.
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2891 (goto-char (point-max))
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2892 (insert-before-markers "\n")
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2893 (enriched-encode (point-min) (1- (point)))
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2894 (goto-char (point-max))
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2895 (delete-char -1)
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2896 '(goto-char (point-min)))))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2897 (setq charset (vm-determine-proper-charset (point-min)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2898 (point-max)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2899 (setq encoding (vm-determine-proper-content-transfer-encoding
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2900 (point-min)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2901 (point-max))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2902 encoding (vm-mime-transfer-encode-region encoding
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2903 (point-min)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2904 (point-max)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2905 t))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2906 (setq boundary-positions (cons (point-marker) boundary-positions))
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2907 (if enriched
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2908 (insert "Content-Type: text/enriched; charset=" charset "\n")
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
2909 (insert "Content-Type: text/plain; charset=" charset "\n"))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2910 (insert "Content-Transfer-Encoding: " encoding "\n\n")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2911 (widen))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2912 (goto-char (overlay-start o))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2913 (narrow-to-region (point) (point))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2914 (setq object (overlay-get o 'vm-mime-object))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2915 ;; insert the object
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2916 (cond ((bufferp object)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2917 ;; as of FSF Emacs 19.34, even with the hooks
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2918 ;; we've attached to the attachment overlays,
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2919 ;; text STILL can be inserted into them when
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2920 ;; font-lock is enabled. Explaining why is
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2921 ;; beyond the scope of this comment and I
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2922 ;; don't know the answer anyway. This works
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2923 ;; to prevent it.
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2924 (insert-before-markers " ")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2925 (forward-char -1)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2926 (insert-buffer-substring object)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2927 (delete-char 1))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2928 ((stringp object)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2929 (insert-before-markers " ")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2930 (forward-char -1)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2931 (insert-file-contents object)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2932 (goto-char (point-max))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2933 (delete-char -1)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2934 ;; gather information about the object from the extent.
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2935 (if (setq already-mimed (overlay-get o 'vm-mime-encoded))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2936 (setq layout (vm-mime-parse-entity
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2937 nil (list "text/plain" "charset=us-ascii")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2938 "7bit")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2939 type (or (overlay-get o 'vm-mime-type)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2940 (car (vm-mm-layout-type layout)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2941 params (or (overlay-get o 'vm-mime-parameters)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2942 (cdr (vm-mm-layout-qtype layout)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2943 description (overlay-get o 'vm-mime-description)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2944 disposition
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2945 (if (not
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2946 (equal
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2947 (car (overlay-get o 'vm-mime-disposition))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2948 "unspecified"))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2949 (overlay-get o 'vm-mime-disposition)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2950 (vm-mm-layout-qdisposition layout)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2951 (setq type (overlay-get o 'vm-mime-type)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2952 params (overlay-get o 'vm-mime-parameters)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2953 description (overlay-get o 'vm-mime-description)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2954 disposition
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2955 (if (not (equal
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2956 (car (overlay-get o 'vm-mime-disposition))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2957 "unspecified"))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2958 (overlay-get o 'vm-mime-disposition)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2959 nil)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2960 (cond ((vm-mime-types-match "text" type)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2961 (setq encoding
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2962 (vm-determine-proper-content-transfer-encoding
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2963 (if already-mimed
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2964 (vm-mm-layout-body-start layout)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2965 (point-min))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2966 (point-max))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2967 encoding (vm-mime-transfer-encode-region
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2968 encoding
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2969 (if already-mimed
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2970 (vm-mm-layout-body-start layout)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2971 (point-min))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2972 (point-max)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2973 t))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2974 (setq 8bit (or 8bit (equal encoding "8bit"))))
136
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2975 ((vm-mime-composite-type-p type)
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2976 (setq opoint-min (point-min))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2977 (if (not already-mimed)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2978 (setq layout (vm-mime-parse-entity
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2979 nil (list "text/plain" "charset=us-ascii")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2980 "7bit")))
136
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
2981 (setq encoding (vm-mime-transfer-encode-layout layout))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2982 (setq 8bit (or 8bit (equal encoding "8bit")))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2983 (goto-char (point-max))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2984 (widen)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2985 (narrow-to-region opoint-min (point)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2986 (t
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2987 (vm-mime-base64-encode-region
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2988 (if already-mimed
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2989 (vm-mm-layout-body-start layout)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2990 (point-min))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2991 (point-max))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2992 (setq encoding "base64")))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2993 (if just-one
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2994 nil
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2995 (goto-char (point-min))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2996 (setq boundary-positions (cons (point-marker) boundary-positions))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2997 (if (not already-mimed)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2998 nil
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
2999 ;; trim headers
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3000 (vm-reorder-message-headers
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3001 nil (nconc (list "Content-Disposition:" "Content-ID:")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3002 (if description
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3003 (list "Content-Description:")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3004 nil))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3005 nil)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3006 ;; remove header/text separator
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3007 (goto-char (1- (vm-mm-layout-body-start layout)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3008 (if (looking-at "\n")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3009 (delete-char 1)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3010 (insert "Content-Type: " type)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3011 (if params
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3012 (if vm-mime-avoid-folding-content-type
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3013 (insert "; " (mapconcat 'identity params "; ") "\n")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3014 (insert ";\n\t" (mapconcat 'identity params ";\n\t") "\n"))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3015 (insert "\n"))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3016 (and description
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3017 (insert "Content-Description: " description "\n"))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3018 (if disposition
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3019 (progn
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3020 (insert "Content-Disposition: " (car disposition))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3021 (if (cdr disposition)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3022 (insert ";\n\t" (mapconcat 'identity
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3023 (cdr disposition)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3024 ";\n\t")))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3025 (insert "\n")))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3026 (insert "Content-Transfer-Encoding: " encoding "\n\n"))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3027 (goto-char (point-max))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3028 (widen)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3029 (save-excursion
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3030 (goto-char (overlay-start o))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3031 (vm-assert (looking-at "\\[ATTACHMENT")))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3032 (delete-region (overlay-start o)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3033 (overlay-end o))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3034 (delete-overlay o)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3035 (if (looking-at "\n")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3036 (delete-char 1))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3037 (setq o-list (cdr o-list)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3038 ;; handle the remaining chunk of text after the last
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3039 ;; extent, if any.
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3040 (if (or just-one (= (point) (point-max)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3041 nil
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
3042 ;; support enriched-mode for text/enriched composition
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
3043 (if enriched
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
3044 (let ((enriched-initial-annotation ""))
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
3045 (enriched-encode (point) (point-max))))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3046 (setq charset (vm-determine-proper-charset (point)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3047 (point-max)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3048 (setq encoding (vm-determine-proper-content-transfer-encoding
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3049 (point)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3050 (point-max))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3051 encoding (vm-mime-transfer-encode-region encoding
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3052 (point)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3053 (point-max)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3054 t))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3055 (setq 8bit (or 8bit (equal encoding "8bit")))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3056 (setq boundary-positions (cons (point-marker) boundary-positions))
140
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
3057 (if enriched
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
3058 (insert "Content-Type: text/enriched; charset=" charset "\n")
585fb297b004 Import from CVS: tag r20-2b4
cvs
parents: 136
diff changeset
3059 (insert "Content-Type: text/plain; charset=" charset "\n"))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3060 (insert "Content-Transfer-Encoding: " encoding "\n\n")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3061 (goto-char (point-max)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3062 (setq boundary (vm-mime-make-multipart-boundary))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3063 (mail-text)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3064 (while (re-search-forward (concat "^--"
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3065 (regexp-quote boundary)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3066 "\\(--\\)?$")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3067 nil t)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3068 (setq boundary (vm-mime-make-multipart-boundary))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3069 (mail-text))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3070 (goto-char (point-max))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3071 (or just-one (insert "\n--" boundary "--\n"))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3072 (while boundary-positions
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3073 (goto-char (car boundary-positions))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3074 (insert "\n--" boundary "\n")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3075 (setq boundary-positions (cdr boundary-positions)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3076 (if (and just-one already-mimed)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3077 (progn
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3078 (goto-char (vm-mm-layout-header-start layout))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3079 ;; trim headers
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3080 (vm-reorder-message-headers
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3081 nil '("Content-Description:" "Content-ID:") nil)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3082 ;; remove header/text separator
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3083 (goto-char (1- (vm-mm-layout-body-start layout)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3084 (if (looking-at "\n")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3085 (delete-char 1))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3086 ;; copy remainder to enclosing entity's header section
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3087 (insert-buffer-substring (current-buffer)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3088 (vm-mm-layout-header-start layout)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3089 (vm-mm-layout-body-start layout))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3090 (delete-region (vm-mm-layout-header-start layout)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3091 (vm-mm-layout-body-start layout))))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3092 (goto-char (point-min))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3093 (vm-remove-mail-mode-header-separator)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3094 (vm-reorder-message-headers
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3095 nil nil "\\(Content-Type:\\|MIME-Version:\\|Content-Transfer-Encoding\\)")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3096 (vm-add-mail-mode-header-separator)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3097 (insert "MIME-Version: 1.0\n")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3098 (if (not just-one)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3099 (insert (if vm-mime-avoid-folding-content-type
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3100 "Content-Type: multipart/mixed; boundary=\""
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3101 "Content-Type: multipart/mixed;\n\tboundary=\"")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3102 boundary "\"\n")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3103 (insert "Content-Type: " type)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3104 (if params
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3105 (if vm-mime-avoid-folding-content-type
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3106 (insert "; " (mapconcat 'identity params "; ") "\n")
126
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
3107 (insert ";\n\t" (mapconcat 'identity params ";\n\t") "\n"))
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
3108 (insert "\n")))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3109 (if just-one
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3110 (and description
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3111 (insert "Content-Description: " description "\n")))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3112 (if (and just-one disposition)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3113 (progn
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3114 (insert "Content-Disposition: " (car disposition))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3115 (if (cdr disposition)
126
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
3116 (if vm-mime-avoid-folding-content-type
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
3117 (insert "; " (mapconcat 'identity (cdr disposition) "; ")
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
3118 "\n")
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
3119 (insert ";\n\t" (mapconcat 'identity (cdr disposition)
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
3120 ";\n\t")))
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
3121 (insert "\n"))))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3122 (if just-one
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3123 (insert "Content-Transfer-Encoding: " encoding "\n")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3124 (if 8bit
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3125 (insert "Content-Transfer-Encoding: 8bit\n")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3126 (insert "Content-Transfer-Encoding: 7bit\n")))))))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3127
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3128 (defun vm-mime-fragment-composition (size)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3129 (save-restriction
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3130 (widen)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
3131 (message "Fragmenting message...")
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3132 (let ((buffers nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3133 (id (vm-mime-make-multipart-boundary))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3134 (n 1)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3135 (the-end nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3136 b header-start header-end master-buffer start end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3137 (vm-remove-mail-mode-header-separator)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3138 ;; message/partial must have "7bit" content transfer
136
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
3139 ;; encoding, so force everything to be encoded for
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3140 ;; 7bit transmission.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3141 (let ((vm-mime-8bit-text-transfer-encoding
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3142 (if (eq vm-mime-8bit-text-transfer-encoding '8bit)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3143 'quoted-printable
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3144 vm-mime-8bit-text-transfer-encoding)))
136
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
3145 (vm-mime-transfer-encode-layout
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
3146 (vm-mime-parse-entity nil (list "text/plain" "charset=us-ascii")
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
3147 "7bit")))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3148 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3149 (setq header-start (point))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3150 (search-forward "\n\n")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3151 (setq header-end (1- (point)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3152 (setq master-buffer (current-buffer))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3153 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3154 (setq start (point))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3155 (while (not (eobp))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3156 (condition-case nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3157 (progn
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3158 (forward-char (max (- size 150) 2000))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3159 (beginning-of-line))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3160 (end-of-buffer (setq the-end t)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3161 (setq end (point))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3162 (setq b (generate-new-buffer (concat (buffer-name) " part "
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3163 (int-to-string n))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3164 (setq buffers (cons b buffers))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3165 (set-buffer b)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3166 (make-local-variable 'vm-send-using-mime)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3167 (setq vm-send-using-mime nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3168 (insert-buffer-substring master-buffer header-start header-end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3169 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3170 (vm-reorder-message-headers nil nil
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3171 "\\(Content-Type:\\|MIME-Version:\\|Content-Transfer-Encoding\\)")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3172 (insert "MIME-Version: 1.0\n")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3173 (insert (format
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3174 (if vm-mime-avoid-folding-content-type
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3175 "Content-Type: message/partial; id=%s; number=%d"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3176 "Content-Type: message/partial;\n\tid=%s;\n\tnumber=%d")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3177 id n))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3178 (if the-end
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3179 (if vm-mime-avoid-folding-content-type
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3180 (insert (format "; total=%d\n" n))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3181 (insert (format ";\n\ttotal=%d\n" n)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3182 (insert "\n"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3183 (insert "Content-Transfer-Encoding: 7bit\n")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3184 (goto-char (point-max))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3185 (insert mail-header-separator "\n")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3186 (insert-buffer-substring master-buffer start end)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3187 (vm-increment n)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3188 (set-buffer master-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3189 (setq start (point)))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
3190 (vm-add-mail-mode-header-separator)
26
441bb1e64a06 Import from CVS: tag r19-15b96
cvs
parents: 24
diff changeset
3191 (message "Fragmenting message... done")
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3192 (nreverse buffers))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3193
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3194 (defun vm-mime-preview-composition ()
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3195 "Show how the current composition buffer might be displayed
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3196 in a MIME-aware mail reader. VM copies and encodes the current
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3197 mail composition buffer and displays it as a mail folder.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3198 Type `q' to quit this temp folder and return to composing your
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3199 message."
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3200 (interactive)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3201 (if (not (eq major-mode 'mail-mode))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3202 (error "Command must be used in a VM Mail mode buffer."))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3203 (let ((temp-buffer nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3204 (mail-buffer (current-buffer))
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
3205 (enriched (and (boundp 'enriched-mode) enriched-mode))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3206 e-list)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3207 (unwind-protect
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3208 (progn
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3209 (setq temp-buffer (generate-new-buffer "composition preview"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3210 (set-buffer temp-buffer)
126
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
3211 ;; so vm-mime-xxxx-encode-composition won't complain
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3212 (setq major-mode 'mail-mode)
146
2af401a6ecca Import from CVS: tag r20-2p1
cvs
parents: 140
diff changeset
3213 (set (make-local-variable 'enriched-mode) enriched)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3214 (vm-insert-region-from-buffer mail-buffer)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3215 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3216 (or (vm-mail-mode-get-header-contents "From")
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
3217 (insert "From: " (user-login-name) "\n"))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3218 (or (vm-mail-mode-get-header-contents "Message-ID")
24
4103f0995bd7 Import from CVS: tag r19-15b95
cvs
parents: 20
diff changeset
3219 (insert "Message-ID: <fake@fake.fake>\n"))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3220 (or (vm-mail-mode-get-header-contents "Date")
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3221 (insert "Date: "
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3222 (format-time-string "%a, %d %b %Y %H%M%S %Z"
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3223 (current-time))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3224 "\n"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3225 (and vm-send-using-mime
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3226 (null (vm-mail-mode-get-header-contents "MIME-Version:"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3227 (vm-mime-encode-composition))
126
1370575f1259 Import from CVS: tag xemacs-20-1p1
cvs
parents: 120
diff changeset
3228 (vm-remove-mail-mode-header-separator)
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3229 (goto-char (point-min))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3230 (insert (vm-leading-message-separator 'From_))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3231 (goto-char (point-max))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3232 (insert (vm-trailing-message-separator 'From_))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3233 (set-buffer-modified-p nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3234 ;; point of no return, don't kill it if the user quits
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3235 (setq temp-buffer nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3236 (let ((vm-auto-decode-mime-messages t)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3237 (vm-auto-displayed-mime-content-types t))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3238 (vm-save-buffer-excursion
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3239 (vm-goto-new-folder-frame-maybe 'folder)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3240 (vm-mode)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3241 (message
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3242 (substitute-command-keys
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3243 "Type \\[vm-quit] to continue composing your message"))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3244 ;; temp buffer, don't offer to save it.
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3245 (setq buffer-offer-save nil)
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3246 (vm-display (or vm-presentation-buffer (current-buffer)) t
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3247 (list this-command) '(vm-mode startup)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3248 (and temp-buffer (kill-buffer temp-buffer)))))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3249
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3250 (defun vm-mime-composite-type-p (type)
136
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
3251 (or (and (vm-mime-types-match "message" type)
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
3252 (not (vm-mime-types-match "message/partial" type))
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
3253 (not (vm-mime-types-match "message/external-body" type)))
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3254 (vm-mime-types-match "multipart" type)))
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents:
diff changeset
3255
136
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
3256 ;; Unused currrently.
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
3257 ;;
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
3258 ;;(defun vm-mime-map-atomic-layouts (function list)
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
3259 ;; (while list
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
3260 ;; (if (vm-mime-composite-type-p (car (vm-mm-layout-type (car list))))
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
3261 ;; (vm-mime-map-atomic-layouts function (vm-mm-layout-parts (car list)))
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
3262 ;; (funcall function (car list)))
b980b6286996 Import from CVS: tag r20-2b2
cvs
parents: 131
diff changeset
3263 ;; (setq list (cdr list))))