[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/gnus/mml.el [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/gnus/mml.el [emacs-unicode-2] |
Date: |
Wed, 29 Sep 2004 03:46:29 -0400 |
Index: emacs/lisp/gnus/mml.el
diff -c emacs/lisp/gnus/mml.el:1.15.6.4 emacs/lisp/gnus/mml.el:1.15.6.5
*** emacs/lisp/gnus/mml.el:1.15.6.4 Mon Sep 27 11:02:42 2004
--- emacs/lisp/gnus/mml.el Wed Sep 29 07:22:15 2004
***************
*** 449,454 ****
--- 449,455 ----
;; 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"))
***************
*** 590,596 ****
(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))
--- 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 nil nil nil nil t))
(t
(insert (cdr (assq 'contents cont)))))
(goto-char (point-min))