Merge branch '0.3.x' immediately after the 0.3.1 release

[notmuch] / emacs / notmuch-wash.el

diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el
index dd5d0a126743659242cfd6bf092a56ea23d6f1dd..46e182435ea24163aafbbf3b436baf7a963002ad 100644 (file)
--- a/emacs/notmuch-wash.el
+++ b/emacs/notmuch-wash.el
@@ -23,6 +23,8 @@
 
 (require 'coolj)
 
+(declare-function notmuch-show-insert-bodypart "notmuch-show" (msg part depth))
+
 ;;
 
 (defvar notmuch-wash-signature-regexp
@@ -114,8 +116,8 @@ is what to put on the button."
                     'invisibility-spec invis-spec
                     :type button-type))))
 
-(defun notmuch-wash-markup-citations (depth)
-  "Markup citations, and up to one signature in the buffer."
+(defun notmuch-wash-excerpt-citations (depth)
+  "Excerpt citations and up to one signature."
   (goto-char (point-min))
   (beginning-of-line)
   (while (and (< (point) (point-max))
@@ -157,9 +159,8 @@ is what to put on the button."
 
 ;;
 
-(defun notmuch-wash-compress-blanks (depth)
-  "Compress successive blank lines into one blank line. Remove
-any leading or trailing blank lines."
+(defun notmuch-wash-elide-blank-lines (depth)
+  "Elide leading, trailing and successive blank lines."
 
   ;; Algorithm derived from `article-strip-multiple-blank-lines' in
   ;; `gnus-art.el'.
@@ -187,7 +188,16 @@ any leading or trailing blank lines."
 ;;
 
 (defun notmuch-wash-tidy-citations (depth)
-  "Clean up citations."
+  "Improve the display of cited regions of a message.
+
+Perform four transformations on the message body:
+
+- Remove lines of repeated citation leaders with no other
+  content,
+- Remove citation leaders standing alone before a block of cited
+  text,
+- Remove citation trailers standing alone after a block of cited
+  text."
 
   ;; Remove lines of repeated citation leaders with no other content.
   (goto-char (point-min))
@@ -204,21 +214,59 @@ any leading or trailing blank lines."
   ;; text.
   (goto-char (point-min))
   (while (re-search-forward "\\(^>[> ]*\n\\)\\(^$\\|^[^>].*\\)" nil t)
-    (replace-match "\\2"))
-
-  ;; Remove blank lines between "Bill wrote:" and the citation.
-  (goto-char (point-min))
-  (while (re-search-forward "^\\([^>].*\\):\n\n>" nil t)
-    (replace-match "\\1:\n>")))
+    (replace-match "\\2")))
 
 ;;
 
 (defun notmuch-wash-wrap-long-lines (depth)
-  "Wrap text in the region whilst maintaining the correct prefix."
+  "Wrap any long lines in the message to the width of the window.
+
+When doing so, maintaining citation leaders in the wrapped text."
+
   (let ((coolj-wrap-follows-window-size nil)
-       (fill-column (- (window-width) depth)))
+       (fill-column (- (window-width)
+                       depth
+                       ;; 2 to avoid poor interaction with
+                       ;; `word-wrap'.
+                       2)))
     (coolj-wrap-region (point-min) (point-max))))
 
 ;;
 
+(require 'diff-mode)
+
+(defvar diff-file-header-re) ; From `diff-mode.el'.
+
+(defun notmuch-wash-convert-inline-patch-to-part (depth)
+  "Convert an inline patch into a fake 'text/x-diff' attachment.
+
+Given that this function guesses whether a buffer includes a
+patch and then guesses the extent of the patch, there is scope
+for error."
+
+  (goto-char (point-min))
+  (if (re-search-forward diff-file-header-re nil t)
+      (progn
+       (beginning-of-line -1)
+       (let ((patch-start (point))
+             (patch-end (point-max))
+             part)
+         (goto-char patch-start)
+         (if (or
+              ;; Patch ends with signature.
+              (re-search-forward notmuch-wash-signature-regexp nil t)
+              ;; Patch ends with bugtraq comment.
+              (re-search-forward "^\\*\\*\\* " nil t))
+             (setq patch-end (match-beginning 0)))
+         (save-restriction
+           (narrow-to-region patch-start patch-end)
+           (setq part (plist-put part :content-type "text/x-diff"))
+           (setq part (plist-put part :content (buffer-string)))
+           (setq part (plist-put part :id -1))
+           (setq part (plist-put part :filename "inline patch"))
+           (delete-region (point-min) (point-max))
+           (notmuch-show-insert-bodypart nil part depth))))))
+
+;;
+
 (provide 'notmuch-wash)