emacs: Move the blank line from the bottom of the headers to the top of the body.

The blank line doesn't really change position, but is now considered
to be part of the body rather than part of the headers. This means
that it is visible when the body is visible rather than when the
headers are visible.

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 26cd22135a9298cdb568625e4e26f624fb2f3d96..7469e2eb8feb6ee8f9ffe0afc8a94a74541e7257 100644 (file)
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -865,8 +865,6 @@ current buffer, if possible."
     ;; compatible with the existing implementation. This just sets it
     ;; to after the first header.
     (notmuch-show-insert-headers headers)
     ;; compatible with the existing implementation. This just sets it
     ;; to after the first header.
     (notmuch-show-insert-headers headers)

-    ;; Headers should include a blank line (backwards compatibility).
-    (insert "\n")

     (save-excursion
       (goto-char content-start)
       ;; If the subject of this message is the same as that of the
     (save-excursion
       (goto-char content-start)
       ;; If the subject of this message is the same as that of the


@@ -881,6 +879,8 @@ current buffer, if possible."
     (setq notmuch-show-previous-subject bare-subject)
 
     (setq body-start (point-marker))
     (setq notmuch-show-previous-subject bare-subject)
 
     (setq body-start (point-marker))

+    ;; A blank line between the headers and the body.
+    (insert "\n")

     (notmuch-show-insert-body msg (plist-get msg :body) depth)
     ;; Ensure that the body ends with a newline.
     (unless (bolp)
     (notmuch-show-insert-body msg (plist-get msg :body) depth)
     ;; Ensure that the body ends with a newline.
     (unless (bolp)