diff options
| author | Miles Bader <miles@gnu.org> | 2004-09-27 07:44:44 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2004-09-27 07:44:44 +0000 |
| commit | f4dd4ae8939a407d9fa989ef0abb02f56151fe66 (patch) | |
| tree | c57a8c484df2ad8b0cf2dc4696a728916b2947d1 /lisp/gnus/mml.el | |
| parent | 6c1178b5ee323394d4f18d83b64109f1bcae109e (diff) | |
| download | emacs-f4dd4ae8939a407d9fa989ef0abb02f56151fe66.tar.gz | |
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-34
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-35
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-36
Update from CVS
Diffstat (limited to 'lisp/gnus/mml.el')
| -rw-r--r-- | lisp/gnus/mml.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el index 21633fb4152..c2c5bbf91e3 100644 --- a/lisp/gnus/mml.el +++ b/lisp/gnus/mml.el @@ -450,6 +450,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." ;; actually are hard newlines in the text. (let (use-hard-newlines) (when (and (string= type "text/plain") + (not (string= (cdr (assq 'sign cont)) "pgp")) (or (null (assq 'format cont)) (string= (cdr (assq 'format cont)) "flowed")) @@ -591,7 +592,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (insert-buffer-substring (cdr (assq 'buffer cont)))) ((and (setq filename (cdr (assq 'filename cont))) (not (equal (cdr (assq 'nofile cont)) "yes"))) - (mm-insert-file-contents filename)) + (mm-insert-file-contents filename nil nil nil nil t)) (t (insert (cdr (assq 'contents cont))))) (goto-char (point-min)) |