* message.el (message-send-news, message-send-mail): Use

	m-b-s-n-p-e-h-n.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd9562d..ccd21bb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2002-01-12  Simon Josefsson  <jas@extundo.com>
 
+       * message.el (message-send-news, message-send-mail): Use
+       m-b-s-n-p-e-h-n.
+
        * mml.el (autoload): Autoload fill-flowed-encode.
        (mml-buffer-substring-no-properties-except-hard-newlines): New
        function.

diff --git a/lisp/message.el b/lisp/message.el
index 66dc5d0..1352954 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2789,9 +2789,10 @@ It should typically alter the sending method in some way or other."
        (save-excursion
          (set-buffer tembuf)
          (erase-buffer)
-         ;; Avoid copying text props.
+         ;; Avoid copying text props (except hard newlines).
          (insert (with-current-buffer mailbuf
-                   (buffer-substring-no-properties (point-min) (point-max))))
+                   (mml-buffer-substring-no-properties-except-hard-newlines
+                    (point-min) (point-max))))
          ;; Remove some headers.
          (message-encode-message-body)
          (save-restriction
@@ -3041,10 +3042,11 @@ Otherwise, generate and save a value for `canlock-password' first."
              (set-buffer tembuf)
              (buffer-disable-undo)
              (erase-buffer)
-             ;; Avoid copying text props.
-             (insert (with-current-buffer messbuf
-                       (buffer-substring-no-properties
-                        (point-min) (point-max))))
+             ;; Avoid copying text props (except hard newlines).
+             (insert
+              (with-current-buffer messbuf
+                (mml-buffer-substring-no-properties-except-hard-newlines
+                 (point-min) (point-max))))
              (message-encode-message-body)
              ;; Remove some headers.
              (save-restriction