Mercurial > emacs
annotate lisp/mail/undigest.el @ 93866:1f769203aa6c
*** empty log message ***
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Tue, 08 Apr 2008 14:57:02 +0000 |
parents | 107ccd98fa12 |
children | 606f2d163a64 1e3a407766b9 |
rev | line source |
---|---|
657
fec3f9a1e3e5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
35
diff
changeset
|
1 ;;; undigest.el --- digest-cracking support for the RMAIL mail reader |
fec3f9a1e3e5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
35
diff
changeset
|
2 |
74509 | 3 ;; Copyright (C) 1985, 1986, 1994, 1996, 2001, 2002, 2003, 2004, |
79712 | 4 ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
841 | 5 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
657
diff
changeset
|
6 ;; Maintainer: FSF |
814
38b2499cb3e9
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
807
diff
changeset
|
7 ;; Keywords: mail |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
657
diff
changeset
|
8 |
35 | 9 ;; This file is part of GNU Emacs. |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
78232
8e27d63c45eb
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
75347
diff
changeset
|
13 ;; the Free Software Foundation; either version 3, or (at your option) |
35 | 14 ;; any later version. |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
14169 | 22 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64085 | 23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
24 ;; Boston, MA 02110-1301, USA. | |
35 | 25 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
657
diff
changeset
|
26 ;;; Commentary: |
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
657
diff
changeset
|
27 |
48868 | 28 ;; See Internet RFC 934 and RFC 1153 |
48871
0d1bd8730873
(rmail-digest-methods, rmail-digest-mail-separator): New variables.
Francesco Potortì <pot@gnu.org>
parents:
48868
diff
changeset
|
29 ;; Also limited support for MIME digest encapsulation |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
657
diff
changeset
|
30 |
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
657
diff
changeset
|
31 ;;; Code: |
35 | 32 |
7038
e640d438df9a
(undigestify-rmail-message): Update summary buffer.
Karl Heuer <kwzh@gnu.org>
parents:
841
diff
changeset
|
33 (require 'rmail) |
e640d438df9a
(undigestify-rmail-message): Update summary buffer.
Karl Heuer <kwzh@gnu.org>
parents:
841
diff
changeset
|
34 |
48901
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
35 (defconst rmail-mail-separator |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
36 "\^_\^L\n0, unseen,,\n*** EOOH ***\n" |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
37 "String for separating messages in an rmail file.") |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
38 |
49547
b020ca291f89
(rmail-forward-separator-regex): New custom variable.
Francesco Potortì <pot@gnu.org>
parents:
49110
diff
changeset
|
39 (defcustom rmail-forward-separator-regex |
b020ca291f89
(rmail-forward-separator-regex): New custom variable.
Francesco Potortì <pot@gnu.org>
parents:
49110
diff
changeset
|
40 "^----.*\\([Ff]orwarded\\|[Oo]riginal\\).*[Mm]essage" |
b020ca291f89
(rmail-forward-separator-regex): New custom variable.
Francesco Potortì <pot@gnu.org>
parents:
49110
diff
changeset
|
41 "*Regexp to match the string that introduces forwarded messages. |
b020ca291f89
(rmail-forward-separator-regex): New custom variable.
Francesco Potortì <pot@gnu.org>
parents:
49110
diff
changeset
|
42 This is not a header, but a string contained in the body of the message. |
63177
284a9ec95650
(rmail-forward-separator-regex): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
52401
diff
changeset
|
43 You may need to customize it for local needs." |
49547
b020ca291f89
(rmail-forward-separator-regex): New custom variable.
Francesco Potortì <pot@gnu.org>
parents:
49110
diff
changeset
|
44 :type 'regexp |
b020ca291f89
(rmail-forward-separator-regex): New custom variable.
Francesco Potortì <pot@gnu.org>
parents:
49110
diff
changeset
|
45 :group 'rmail-headers) |
b020ca291f89
(rmail-forward-separator-regex): New custom variable.
Francesco Potortì <pot@gnu.org>
parents:
49110
diff
changeset
|
46 |
48901
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
47 |
48868 | 48 (defconst rmail-digest-methods |
49 '(rmail-digest-parse-mime | |
50 rmail-digest-parse-rfc1153strict | |
51 rmail-digest-parse-rfc1153sloppy | |
52 rmail-digest-parse-rfc934) | |
48901
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
53 "List of digest parsing functions, first tried first. |
48868 | 54 |
48901
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
55 These functions operate on the current narrowing, and take no argument. |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
56 A function returns nil if it cannot parse the digest. If it can, it |
48868 | 57 returns a list of cons pairs containing the start and end positions of |
58 each undigestified message as markers.") | |
59 | |
60 (defun rmail-digest-parse-mime () | |
61 (goto-char (point-min)) | |
62 (when (let ((head-end (progn (search-forward "\n\n" nil t) (point)))) | |
63 (goto-char (point-min)) | |
64 (and head-end | |
65 (re-search-forward | |
66 (concat | |
67 "^Content-type: multipart/digest;" | |
68 "\\s-* boundary=\"?\\([^\";\n]+\\)[\";\n]") head-end t) | |
69 (search-forward (match-string 1) nil t))) | |
70 ;; Ok, prolog separator found | |
71 (let ((start (make-marker)) | |
72 (end (make-marker)) | |
73 (separator (concat "\n--" (match-string 0) "\n\n")) | |
74 result) | |
75 (while (search-forward separator nil t) | |
76 (move-marker start (match-beginning 0)) | |
77 (move-marker end (match-end 0)) | |
78 (add-to-list 'result (cons (copy-marker start) (copy-marker end t)))) | |
79 ;; Return the list of marker pairs | |
80 (nreverse result)))) | |
81 | |
82 (defun rmail-digest-parse-rfc1153strict () | |
83 "Parse following strictly the method defined in RFC 1153. | |
84 See rmail-digest-methods." | |
85 (rmail-digest-rfc1153 | |
86 "^-\\{70\\}\n\n" | |
87 "^\n-\\{30\\}\n\n" | |
88 "^\n-\\{30\\}\n\nEnd of .* Digest.*\n\\*\\{15,\\}\n+\'")) | |
89 | |
90 (defun rmail-digest-parse-rfc1153sloppy () | |
91 "Parse using the method defined in RFC 1153, allowing for some sloppiness. | |
92 See rmail-digest-methods." | |
93 (rmail-digest-rfc1153 | |
94 "^-\\{55,\\}\n\n" | |
95 "^\n-\\{27,\\}\n\n" | |
78558
ce34261da54f
(rmail-digest-parse-rfc1153sloppy): Be even sloppier, for the sake of
Glenn Morris <rgm@gnu.org>
parents:
78232
diff
changeset
|
96 ;; GNU Mailman knowingly (see comment at line 353 of ToDigest.py in |
ce34261da54f
(rmail-digest-parse-rfc1153sloppy): Be even sloppier, for the sake of
Glenn Morris <rgm@gnu.org>
parents:
78232
diff
changeset
|
97 ;; Mailman source) produces non-conformant rfc 1153 digests, in that |
ce34261da54f
(rmail-digest-parse-rfc1153sloppy): Be even sloppier, for the sake of
Glenn Morris <rgm@gnu.org>
parents:
78232
diff
changeset
|
98 ;; the trailer contains a "digest footer" like this: |
ce34261da54f
(rmail-digest-parse-rfc1153sloppy): Be even sloppier, for the sake of
Glenn Morris <rgm@gnu.org>
parents:
78232
diff
changeset
|
99 ;; _______________________________________________ |
ce34261da54f
(rmail-digest-parse-rfc1153sloppy): Be even sloppier, for the sake of
Glenn Morris <rgm@gnu.org>
parents:
78232
diff
changeset
|
100 ;; <one or more lines of list blurb> |
ce34261da54f
(rmail-digest-parse-rfc1153sloppy): Be even sloppier, for the sake of
Glenn Morris <rgm@gnu.org>
parents:
78232
diff
changeset
|
101 ;; |
ce34261da54f
(rmail-digest-parse-rfc1153sloppy): Be even sloppier, for the sake of
Glenn Morris <rgm@gnu.org>
parents:
78232
diff
changeset
|
102 ;; End of Foo Digest... |
ce34261da54f
(rmail-digest-parse-rfc1153sloppy): Be even sloppier, for the sake of
Glenn Morris <rgm@gnu.org>
parents:
78232
diff
changeset
|
103 ;; ************************************** |
ce34261da54f
(rmail-digest-parse-rfc1153sloppy): Be even sloppier, for the sake of
Glenn Morris <rgm@gnu.org>
parents:
78232
diff
changeset
|
104 "^\nEnd of")) |
48868 | 105 |
106 (defun rmail-digest-rfc1153 (prolog-sep message-sep trailer-sep) | |
107 (goto-char (point-min)) | |
108 (when (re-search-forward prolog-sep nil t) | |
109 ;; Ok, prolog separator found | |
110 (let ((start (make-marker)) | |
111 (end (make-marker)) | |
112 separator result) | |
113 (move-marker start (match-beginning 0)) | |
114 (move-marker end (match-end 0)) | |
78558
ce34261da54f
(rmail-digest-parse-rfc1153sloppy): Be even sloppier, for the sake of
Glenn Morris <rgm@gnu.org>
parents:
78232
diff
changeset
|
115 (setq result (list (cons (copy-marker start) (copy-marker end t)))) |
48868 | 116 (when (re-search-forward message-sep nil t) |
117 ;; Ok, at least one message separator found | |
118 (setq separator (match-string 0)) | |
119 (when (re-search-forward trailer-sep nil t) | |
120 ;; Wonderful, we found a trailer, too. Now, go on splitting | |
121 ;; the digest into separate rmail messages | |
122 (goto-char (cdar result)) | |
123 (while (search-forward separator nil t) | |
124 (move-marker start (match-beginning 0)) | |
125 (move-marker end (match-end 0)) | |
126 (add-to-list 'result | |
127 (cons (copy-marker start) (copy-marker end t)))) | |
128 ;; Undo masking of separators inside digestified messages | |
129 (goto-char (point-min)) | |
130 (while (search-forward | |
131 (replace-regexp-in-string "\n-" "\n " separator) nil t) | |
132 (replace-match separator)) | |
133 ;; Return the list of marker pairs | |
134 (nreverse result)))))) | |
135 | |
136 (defun rmail-digest-parse-rfc934 () | |
137 (goto-char (point-min)) | |
138 (when (re-search-forward "^\n?-[^ ].*\n\n?" nil t) | |
139 ;; Message separator found | |
140 (let ((start (make-marker)) | |
141 (end (make-marker)) | |
142 (separator (match-string 0)) | |
143 result) | |
144 (goto-char (point-min)) | |
145 (while (search-forward separator nil t) | |
146 (move-marker start (match-beginning 0)) | |
147 (move-marker end (match-end 0)) | |
148 (add-to-list 'result (cons (copy-marker start) (copy-marker end t)))) | |
149 ;; Undo masking of separators inside digestified messages | |
150 (goto-char (point-min)) | |
151 (while (search-forward "\n- -" nil t) | |
152 (replace-match "\n-")) | |
153 ;; Return the list of marker pairs | |
154 (nreverse result)))) | |
155 | |
86440
4aedd218aad1
* mail/mspools.el (rmail-get-new-mail):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78558
diff
changeset
|
156 (declare-function rmail-update-summary "rmailsum" (&rest ignore)) |
4aedd218aad1
* mail/mspools.el (rmail-get-new-mail):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78558
diff
changeset
|
157 |
16348
2cf33d3c5540
Add many autoload cookies.
Richard M. Stallman <rms@gnu.org>
parents:
15438
diff
changeset
|
158 ;;;###autoload |
35 | 159 (defun undigestify-rmail-message () |
160 "Break up a digest message into its constituent messages. | |
161 Leaves original message, deleted, before the undigestified messages." | |
162 (interactive) | |
20520
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
163 (with-current-buffer rmail-buffer |
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
164 (widen) |
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
165 (let ((error t) |
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
166 (buffer-read-only nil)) |
48868 | 167 (goto-char (rmail-msgend rmail-current-message)) |
168 (let ((msg-copy (buffer-substring (rmail-msgbeg rmail-current-message) | |
169 (rmail-msgend rmail-current-message)))) | |
170 (narrow-to-region (point) (point)) | |
171 (insert msg-copy)) | |
172 (narrow-to-region (point-min) (1- (point-max))) | |
20520
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
173 (unwind-protect |
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
174 (progn |
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
175 (save-restriction |
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
176 (goto-char (point-min)) |
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
177 (delete-region (point-min) |
48868 | 178 (progn (search-forward "\n*** EOOH ***\n" nil t) |
20520
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
179 (point))) |
48901
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
180 (insert "\n" rmail-mail-separator) |
20520
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
181 (narrow-to-region (point) |
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
182 (point-max)) |
48868 | 183 (let ((fill-prefix "") |
184 (case-fold-search t) | |
185 digest-name type start end separator fun-list sep-list) | |
186 (setq digest-name (mail-strip-quoted-names | |
187 (save-restriction | |
188 (search-forward "\n\n" nil 'move) | |
189 (setq start (point)) | |
190 (narrow-to-region (point-min) start) | |
191 (or (mail-fetch-field "Reply-To") | |
192 (mail-fetch-field "To") | |
193 (mail-fetch-field "Apparently-To") | |
194 (mail-fetch-field "From"))))) | |
195 (unless digest-name | |
196 (error "Message is not a digest--bad header")) | |
197 | |
198 (setq fun-list rmail-digest-methods) | |
199 (while (and fun-list | |
200 (null (setq sep-list (funcall (car fun-list))))) | |
201 (setq fun-list (cdr fun-list))) | |
202 (unless sep-list | |
203 (error "Message is not a digest--no messages found")) | |
204 | |
205 ;;; Split the digest into separate rmail messages | |
206 (while sep-list | |
207 (let ((start (caar sep-list)) | |
208 (end (cdar sep-list))) | |
209 (delete-region start end) | |
210 (goto-char start) | |
48901
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
211 (insert rmail-mail-separator) |
48868 | 212 (search-forward "\n\n" (caar (cdr sep-list)) 'move) |
213 (save-restriction | |
214 (narrow-to-region end (point)) | |
215 (unless (mail-fetch-field "To") | |
216 (goto-char start) | |
217 (insert "To: " digest-name "\n"))) | |
218 (set-marker start nil) | |
219 (set-marker end nil)) | |
220 (setq sep-list (cdr sep-list))))) | |
221 | |
20520
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
222 (setq error nil) |
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
223 (message "Message successfully undigestified") |
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
224 (let ((n rmail-current-message)) |
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
225 (rmail-forget-messages) |
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
226 (rmail-show-message n) |
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
227 (rmail-delete-forward) |
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
228 (if (rmail-summary-exists) |
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
229 (rmail-select-summary |
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
230 (rmail-update-summary))))) |
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
231 (cond (error |
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
232 (narrow-to-region (point-min) (1+ (point-max))) |
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
233 (delete-region (point-min) (point-max)) |
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
234 (rmail-show-message rmail-current-message))))))) |
48901
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
235 |
16348
2cf33d3c5540
Add many autoload cookies.
Richard M. Stallman <rms@gnu.org>
parents:
15438
diff
changeset
|
236 ;;;###autoload |
14630
584eb99710a6
(unforward-rmail-message): New command.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
237 (defun unforward-rmail-message () |
584eb99710a6
(unforward-rmail-message): New command.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
238 "Extract a forwarded message from the containing message. |
584eb99710a6
(unforward-rmail-message): New command.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
239 This puts the forwarded message into a separate rmail message |
584eb99710a6
(unforward-rmail-message): New command.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
240 following the containing message." |
584eb99710a6
(unforward-rmail-message): New command.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
241 (interactive) |
20520
7be5edf3710f
(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
242 ;; If we are in a summary buffer, switch to the Rmail buffer. |
48901
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
243 (unwind-protect |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
244 (with-current-buffer rmail-buffer |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
245 (goto-char (point-min)) |
49878
3e58b8375243
(unforward-rmail-message): Allow nested
Francesco Potortì <pot@gnu.org>
parents:
49547
diff
changeset
|
246 (narrow-to-region (point) |
3e58b8375243
(unforward-rmail-message): Allow nested
Francesco Potortì <pot@gnu.org>
parents:
49547
diff
changeset
|
247 (save-excursion (search-forward "\n\n") (point))) |
48901
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
248 (let ((buffer-read-only nil) |
49878
3e58b8375243
(unforward-rmail-message): Allow nested
Francesco Potortì <pot@gnu.org>
parents:
49547
diff
changeset
|
249 (old-fwd-from (mail-fetch-field "Forwarded-From" nil nil t)) |
3e58b8375243
(unforward-rmail-message): Allow nested
Francesco Potortì <pot@gnu.org>
parents:
49547
diff
changeset
|
250 (old-fwd-date (mail-fetch-field "Forwarded-Date" nil nil t)) |
3e58b8375243
(unforward-rmail-message): Allow nested
Francesco Potortì <pot@gnu.org>
parents:
49547
diff
changeset
|
251 (fwd-from (mail-fetch-field "From")) |
3e58b8375243
(unforward-rmail-message): Allow nested
Francesco Potortì <pot@gnu.org>
parents:
49547
diff
changeset
|
252 (fwd-date (mail-fetch-field "Date")) |
49110
756931f84374
(unforward-rmail-message): Don't use global variable `n'.
Kim F. Storm <storm@cua.dk>
parents:
49109
diff
changeset
|
253 beg end prefix forward-msg) |
49878
3e58b8375243
(unforward-rmail-message): Allow nested
Francesco Potortì <pot@gnu.org>
parents:
49547
diff
changeset
|
254 (narrow-to-region (rmail-msgbeg rmail-current-message) |
3e58b8375243
(unforward-rmail-message): Allow nested
Francesco Potortì <pot@gnu.org>
parents:
49547
diff
changeset
|
255 (rmail-msgend rmail-current-message)) |
3e58b8375243
(unforward-rmail-message): Allow nested
Francesco Potortì <pot@gnu.org>
parents:
49547
diff
changeset
|
256 (goto-char (point-min)) |
49547
b020ca291f89
(rmail-forward-separator-regex): New custom variable.
Francesco Potortì <pot@gnu.org>
parents:
49110
diff
changeset
|
257 (cond ((re-search-forward rmail-forward-separator-regex nil t) |
48901
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
258 (forward-line 1) |
49097
217ecd0c470e
(unforward-rmail-message): Skip all newlines
Francesco Potortì <pot@gnu.org>
parents:
48957
diff
changeset
|
259 (skip-chars-forward "\n") |
48901
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
260 (setq beg (point)) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
261 (setq end (if (re-search-forward "^----.*[^- \t\n]" nil t) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
262 (match-beginning 0) (point-max))) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
263 (setq forward-msg |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
264 (replace-regexp-in-string |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
265 "^- -" "-" (buffer-substring beg end)))) |
48957
d8dfc5e743b6
(unforward-rmail-message): Do not assume that
Francesco Potortì <pot@gnu.org>
parents:
48901
diff
changeset
|
266 ((and (re-search-forward "^\\(> ?\\)[a-zA-Z-]+: .*\n" nil t) |
48901
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
267 (setq beg (match-beginning 0)) |
49109
39d762048cdd
(unforward-rmail-message): Simplified. No functional change.
Francesco Potortì <pot@gnu.org>
parents:
49097
diff
changeset
|
268 (setq prefix (match-string-no-properties 1)) |
48957
d8dfc5e743b6
(unforward-rmail-message): Do not assume that
Francesco Potortì <pot@gnu.org>
parents:
48901
diff
changeset
|
269 (goto-char beg) |
48901
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
270 (looking-at (concat "\\(" prefix ".+\n\\)*" |
49109
39d762048cdd
(unforward-rmail-message): Simplified. No functional change.
Francesco Potortì <pot@gnu.org>
parents:
49097
diff
changeset
|
271 prefix "Date: .")) |
48957
d8dfc5e743b6
(unforward-rmail-message): Do not assume that
Francesco Potortì <pot@gnu.org>
parents:
48901
diff
changeset
|
272 (looking-at (concat "\\(" prefix ".+\n\\)*" |
d8dfc5e743b6
(unforward-rmail-message): Do not assume that
Francesco Potortì <pot@gnu.org>
parents:
48901
diff
changeset
|
273 prefix "From: .+\n" |
d8dfc5e743b6
(unforward-rmail-message): Do not assume that
Francesco Potortì <pot@gnu.org>
parents:
48901
diff
changeset
|
274 "\\(" prefix ".+\n\\)*" |
48901
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
275 "\\(> ?\\)?\n" prefix))) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
276 (re-search-forward "^[^>\n]" nil 'move) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
277 (backward-char) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
278 (skip-chars-backward " \t\n") |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
279 (forward-line 1) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
280 (setq end (point)) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
281 (setq forward-msg |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
282 (replace-regexp-in-string |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
283 (if (string= prefix ">") "^>" "> ?") |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
284 "" (buffer-substring beg end)))) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
285 (t |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
286 (error "No forwarded message found"))) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
287 (widen) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
288 (goto-char (rmail-msgend rmail-current-message)) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
289 (narrow-to-region (point) (point)) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
290 (insert rmail-mail-separator) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
291 (narrow-to-region (point) (point)) |
49878
3e58b8375243
(unforward-rmail-message): Allow nested
Francesco Potortì <pot@gnu.org>
parents:
49547
diff
changeset
|
292 (while old-fwd-from |
3e58b8375243
(unforward-rmail-message): Allow nested
Francesco Potortì <pot@gnu.org>
parents:
49547
diff
changeset
|
293 (insert "Forwarded-From: " (car old-fwd-from) "\n") |
3e58b8375243
(unforward-rmail-message): Allow nested
Francesco Potortì <pot@gnu.org>
parents:
49547
diff
changeset
|
294 (insert "Forwarded-Date: " (car old-fwd-date) "\n") |
3e58b8375243
(unforward-rmail-message): Allow nested
Francesco Potortì <pot@gnu.org>
parents:
49547
diff
changeset
|
295 (setq old-fwd-from (cdr old-fwd-from)) |
3e58b8375243
(unforward-rmail-message): Allow nested
Francesco Potortì <pot@gnu.org>
parents:
49547
diff
changeset
|
296 (setq old-fwd-date (cdr old-fwd-date))) |
3e58b8375243
(unforward-rmail-message): Allow nested
Francesco Potortì <pot@gnu.org>
parents:
49547
diff
changeset
|
297 (insert "Forwarded-From: " fwd-from "\n") |
3e58b8375243
(unforward-rmail-message): Allow nested
Francesco Potortì <pot@gnu.org>
parents:
49547
diff
changeset
|
298 (insert "Forwarded-Date: " fwd-date "\n") |
48901
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
299 (insert forward-msg) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
300 (save-restriction |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
301 (goto-char (point-min)) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
302 (re-search-forward "\n$" nil 'move) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
303 (narrow-to-region (point-min) (point)) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
304 (goto-char (point-min)) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
305 (while (not (eobp)) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
306 (unless (looking-at "^[a-zA-Z-]+: ") |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
307 (insert "\t")) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
308 (forward-line))) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
309 (goto-char (point-min)))) |
49110
756931f84374
(unforward-rmail-message): Don't use global variable `n'.
Kim F. Storm <storm@cua.dk>
parents:
49109
diff
changeset
|
310 (let ((n rmail-current-message)) |
756931f84374
(unforward-rmail-message): Don't use global variable `n'.
Kim F. Storm <storm@cua.dk>
parents:
49109
diff
changeset
|
311 (rmail-forget-messages) |
756931f84374
(unforward-rmail-message): Don't use global variable `n'.
Kim F. Storm <storm@cua.dk>
parents:
49109
diff
changeset
|
312 (rmail-show-message n)) |
48901
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
313 (if (rmail-summary-exists) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
314 (rmail-select-summary |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
315 (rmail-update-summary))))) |
6f912a2e94c1
(rmail-mail-separator): Renamed from
Francesco Potortì <pot@gnu.org>
parents:
48871
diff
changeset
|
316 |
14630
584eb99710a6
(unforward-rmail-message): New command.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
317 |
18383 | 318 (provide 'undigest) |
319 | |
52401 | 320 ;;; arch-tag: 3a28b9fb-c1f5-43ef-9278-285f3e4b874d |
657
fec3f9a1e3e5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
35
diff
changeset
|
321 ;;; undigest.el ends here |