[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/gnus/mml.el
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/gnus/mml.el |
Date: |
Mon, 27 Sep 2004 04:01:55 -0400 |
Index: emacs/lisp/gnus/mml.el
diff -c emacs/lisp/gnus/mml.el:1.18 emacs/lisp/gnus/mml.el:1.19
*** emacs/lisp/gnus/mml.el:1.18 Mon Sep 20 12:03:04 2004
--- emacs/lisp/gnus/mml.el Mon Sep 27 07:44:44 2004
***************
*** 450,455 ****
--- 450,456 ----
;; 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,597 ****
(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))
(t
(insert (cdr (assq 'contents cont)))))
(goto-char (point-min))
--- 592,598 ----
(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 nil nil nil nil t))
(t
(insert (cdr (assq 'contents cont)))))
(goto-char (point-min))