notmuch.el: Insert a newline if the last line of a part is missing one.

[notmuch] / notmuch.el

diff --git a/notmuch.el b/notmuch.el
index 07193066a511d38e7bedb500c31c35168d052b8e..f1523ac0419c5dac502469339a26fac637502a6f 100644 (file)
--- a/notmuch.el
+++ b/notmuch.el
@@ -464,11 +464,15 @@ which this thread was originally shown."
        (let ((beg (point-marker)))
          (re-search-forward notmuch-show-part-end-regexp)
          (let ((end (copy-marker (match-beginning 0))))
+           (goto-char end)
+           (if (not (bolp))
+               (insert "\n"))
            (indent-rigidly beg end depth)
            (notmuch-show-markup-citations-region beg end depth)
            ; Advance to the next part (if any) (so the outer loop can
            ; determine whether we've left the current message.
-           (re-search-forward notmuch-show-part-begin-regexp nil t))))
+           (if (re-search-forward notmuch-show-part-begin-regexp nil t)
+               (beginning-of-line)))))
     (goto-char end)))
 
 (defun notmuch-show-markup-parts-region (beg end depth)
@@ -658,6 +662,9 @@ thread from that buffer can be show when done with this one)."
                  (notmuch-show-toggle-body-read-visible)))))
       )))
 
+(defvar notmuch-search-authors-width 40
+  "Number of columns to use to diplay authors in a notmuch-search buffer.")
+
 (defvar notmuch-search-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map "a" 'notmuch-search-archive-thread)
@@ -756,7 +763,17 @@ global search.
     (if (re-search-forward "thread:[a-fA-F0-9]*" nil t)
        (progn
          (forward-char)
-         (overlay-put (make-overlay beg (point)) 'invisible 'notmuch-search)))))
+         (overlay-put (make-overlay beg (point)) 'invisible 'notmuch-search)
+         (re-search-forward ".*\\[[0-9]*/[0-9]*\\] \\([^;]*\\)\\(;\\)")
+         (let* ((authors (buffer-substring (match-beginning 1) (match-end 1)))
+                (authors-length (length authors)))
+           ;; Drop the semi-colon
+           (replace-match "" t nil nil 2)
+           (if (<= authors-length notmuch-search-authors-width)
+               (replace-match (concat authors (make-string
+                                               (- notmuch-search-authors-width
+                                                  authors-length) ? )) t t nil 1)
+             (replace-match (concat (substring authors 0 (- notmuch-search-authors-width 3)) "...") t t nil 1)))))))
 
 (defun notmuch-search-markup-thread-ids ()
   (save-excursion