X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-show.el;h=4b1baf38dd2a5bcc3fc64145fb15407943be7bd1;hb=b749bd5390ce8b478de202495574c441dd875edf;hp=814ab65183c5f6658b3988d5772d424d888a3193;hpb=75b9b028ea4d611841441b744291e1181b37548f;p=notmuch

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 814ab651..4b1baf38 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -62,33 +62,20 @@ any given message."
   "A list of functions called to decorate the headers listed in
 `notmuch-message-headers'.")
 
-(defcustom notmuch-show-hook '(notmuch-show-pretty-hook)
-  "A list of functions called after populating a
-`notmuch-show' buffer."
+(defcustom notmuch-show-hook nil
+  "Functions called after populating a `notmuch-show' buffer."
   :group 'notmuch
-  :type 'hook
-  :options '(notmuch-show-pretty-hook
-	     notmuch-show-turn-off-word-wrap))
-
-(defcustom notmuch-show-insert-text/plain-hook
-  '(notmuch-wash-tidy-citations
-    notmuch-wash-compress-blanks
-    notmuch-wash-markup-citations)
-  "A list of functions called to clean up text/plain body parts."
+  :type 'hook)
+
+(defcustom notmuch-show-insert-text/plain-hook '(notmuch-wash-excerpt-citations)
+  "Functions used to improve the display of text/plain parts."
   :group 'notmuch
   :type 'hook
-  :options '(notmuch-wash-wrap-long-lines
+  :options '(notmuch-wash-convert-inline-patch-to-part
+	     notmuch-wash-wrap-long-lines
 	     notmuch-wash-tidy-citations
-	     notmuch-wash-compress-blanks
-	     notmuch-wash-markup-citations))
-
-(defun notmuch-show-pretty-hook ()
-  (goto-address-mode 1)
-  (visual-line-mode))
-
-(defun notmuch-show-turn-off-word-wrap ()
-  ;; `toggle-word-wrap' outputs a message, which is distracting.
-  (setq word-wrap nil))
+	     notmuch-wash-elide-blank-lines
+	     notmuch-wash-excerpt-citations))
 
 (defmacro with-current-notmuch-show-message (&rest body)
   "Evaluate body with current buffer set to the text of current message"
@@ -528,6 +515,13 @@ function is used. "
 		   query-context)
 	  (notmuch-show-insert-forest
 	   (notmuch-query-get-threads basic-args))))
+
+      ;; Enable buttonisation of URLs and email addresses in the
+      ;; buffer.
+      (goto-address-mode t)
+      ;; Act on visual lines rather than logical lines.
+      (visual-line-mode t)
+
       (run-hooks 'notmuch-show-hook))
 
     ;; Move straight to the first open message
@@ -840,8 +834,8 @@ any effects from previous calls to
       ;; If a small number of lines from the previous message are
       ;; visible, realign so that the top of the current message is at
       ;; the top of the screen.
-      (if (< (count-lines (window-start) (notmuch-show-message-top))
-	     next-screen-context-lines)
+      (if (<= (count-screen-lines (window-start) start-of-message)
+	      next-screen-context-lines)
 	  (progn
 	    (goto-char (notmuch-show-message-top))
 	    (notmuch-show-message-adjust)))