Mercurial > emacs
comparison lisp/mail/uce.el @ 90203:187d6a1f84f7
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-71
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 485-492)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 92-94)
- Merge from emacs--cvs-trunk--0
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 22 Jul 2005 08:27:27 +0000 |
parents | f9a65d7ebd29 d24c0f192f20 |
children | 2d92f5c9d6ae |
comparison
equal
deleted
inserted
replaced
90202:7597b4a23c3b | 90203:187d6a1f84f7 |
---|---|
281 (cond ((eq uce-mail-reader 'gnus) | 281 (cond ((eq uce-mail-reader 'gnus) |
282 ;; Does Gnus always have Lines: in the end? | 282 ;; Does Gnus always have Lines: in the end? |
283 (re-search-forward "^Lines:") | 283 (re-search-forward "^Lines:") |
284 (beginning-of-line)) | 284 (beginning-of-line)) |
285 ((eq uce-mail-reader 'rmail) | 285 ((eq uce-mail-reader 'rmail) |
286 (beginning-of-buffer) | 286 (goto-char (point-min)) |
287 (search-forward "*** EOOH ***\n") | 287 (search-forward "*** EOOH ***\n") |
288 (beginning-of-line) | 288 (beginning-of-line) |
289 (forward-line -1))) | 289 (forward-line -1))) |
290 (re-search-backward "^Received:") | 290 (re-search-backward "^Received:") |
291 (beginning-of-line) | 291 (beginning-of-line) |
362 ;; Signature. | 362 ;; Signature. |
363 (cond ((eq uce-signature t) | 363 (cond ((eq uce-signature t) |
364 (if (file-exists-p "~/.signature") | 364 (if (file-exists-p "~/.signature") |
365 (progn | 365 (progn |
366 (insert "\n\n-- \n") | 366 (insert "\n\n-- \n") |
367 (insert-file "~/.signature") | 367 (forward-char (cadr (insert-file-contents "~/.signature")))))) |
368 ;; Function insert-file leaves point where it was, | |
369 ;; while we want to place signature in the ``middle'' | |
370 ;; of the message. | |
371 (exchange-point-and-mark)))) | |
372 (uce-signature | 368 (uce-signature |
373 (insert "\n\n-- \n" uce-signature))) | 369 (insert "\n\n-- \n" uce-signature))) |
374 ;; And text of the original message. | 370 ;; And text of the original message. |
375 (if uce-uce-separator | 371 (if uce-uce-separator |
376 (insert "\n\n" uce-uce-separator "\n")) | 372 (insert "\n\n" uce-uce-separator "\n")) |