X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-wash.el;h=57f0cc5cbe4781a14b7897ea475b7bab884fd6ea;hb=107f58d517e733c53e9d669457db34622337931d;hp=dd5d0a126743659242cfd6bf092a56ea23d6f1dd;hpb=97570954cb583cacac35b0235cbe449a07630ae3;p=notmuch

diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el
index dd5d0a12..57f0cc5c 100644
--- a/emacs/notmuch-wash.el
+++ b/emacs/notmuch-wash.el
@@ -114,8 +114,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 +157,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 +186,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,19 +212,21 @@ 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))))
 
 ;;