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

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 814ab651..d66894ae 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -58,37 +58,29 @@ any given message."
   :group 'notmuch
   :type 'boolean)
 
+(defcustom notmuch-show-relative-dates t
+  "Display relative dates in the message summary line."
+  :group 'notmuch
+  :type 'boolean)
+
 (defvar notmuch-show-markup-headers-hook '(notmuch-show-colour-headers)
   "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"
@@ -202,7 +194,8 @@ any given message."
     (if (re-search-forward "(\\([^()]*\\))$" (line-end-position) t)
 	(let ((inhibit-read-only t))
 	  (replace-match (concat "("
-				 (mapconcat 'identity tags " ")
+				 (propertize (mapconcat 'identity tags " ")
+					     'face 'notmuch-tag-face)
 				 ")"))))))
 
 (defun notmuch-show-insert-headerline (headers date tags depth)
@@ -214,7 +207,8 @@ message at DEPTH in the current thread."
 	    " ("
 	    date
 	    ") ("
-	    (mapconcat 'identity tags " ")
+	    (propertize (mapconcat 'identity tags " ")
+			'face 'notmuch-tag-face)
 	    ")\n")
     (overlay-put (make-overlay start (point)) 'face 'notmuch-message-summary-face)))
 
@@ -418,7 +412,9 @@ current buffer, if possible."
     (setq message-start (point-marker))
 
     (notmuch-show-insert-headerline headers
-				    (or (plist-get msg :date_relative)
+				    (or (if notmuch-show-relative-dates
+					    (plist-get msg :date_relative)
+					  nil)
 					(plist-get headers :Date))
 				    (plist-get msg :tags) depth)
 
@@ -528,6 +524,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
@@ -554,6 +557,7 @@ function is used. "
 	(define-key map "?" 'notmuch-help)
 	(define-key map "q" 'kill-this-buffer)
 	(define-key map (kbd "M-TAB") 'notmuch-show-previous-button)
+	(define-key map (kbd "<backtab>") 'notmuch-show-previous-button)
 	(define-key map (kbd "TAB") 'notmuch-show-next-button)
 	(define-key map "s" 'notmuch-search)
 	(define-key map "m" 'notmuch-mua-mail)
@@ -840,8 +844,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)))