(rmail-cease-edit): Use rmail-ensure-blank-line.

2 files changed, 24 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9bd73463197..5f9a617aa44 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,24 @@
+2009-03-05  Glenn Morris  <rgm@gnu.org>
+
+        * mail/rmail.el (rmail-perm-variables): rmail-overlay-list needs to be
+        buffer-local in the view buffer, not the rmail buffer.
+
+        * mail/rmailout.el (rmail-output-to-rmail-buffer): Add the new message
+        at the end of the existing messages, ensuring there is a blank line
+        between them.  (Bug#2521)
+
+        * mail/rmail.el (rmail-ensure-blank-line): New function.
+        * mail/rmailedit.el (rmail-cease-edit):
+        * mail/rmailout.el (rmail-output-as-mbox):
+        * mail/rmailsort.el (rmail-sort-messages): Use rmail-ensure-blank-line.
+
+        * mail/rmailmm.el (rmail-mime-media-type-handlers-alist)
+        (rmail-mime-attachment-dirs-alist): Doc fixes.  Fix custom-type.
+        Add version.
+        (rmail-mime-total-number-of-bulk-attachments): Doc fix.
+        (rmail-mime): Doc fix.  Use rmail-apply-in-message.
+        Disable undo in the mime buffer, mark unmodified.
+
 2009-03-04  David Reitter <david.reitter@gmail.com>
 
         * menu-bar.el (clipboard-yank): avoid
diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index 7d757793eff..5b01e943541 100644
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -125,14 +125,11 @@ This function runs the hooks `text-mode-hook' and `rmail-edit-mode-hook'.
       (beginning-of-line)
       (insert ">")
       (forward-line)))
-  ;; Make sure buffer ends with a blank line
-  ;; so as not to run this message together with the following one.
+  ;; Make sure buffer ends with a blank line so as not to run this
+  ;; message together with the following one.
   (save-excursion
     (goto-char (point-max))
-    (if (/= (preceding-char) ?\n)
-        (insert "\n"))
-    (unless (looking-back "\n\n")
-      (insert "\n")))
+    (rmail-ensure-blank-line))
   (let ((old rmail-old-text)
         (pruned rmail-old-pruned)
         ;; People who know what they are doing might have modified the