Add C-tab binding in notmuch-search mode as well.

[notmuch] / emacs / notmuch-show.el

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index f9d6c93edee6aef03d3c40657343e32283522c60..f872cdfe00d44c1a498ad1ad46abe6b4ee84d1c4 100644 (file)
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -58,20 +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'.")
 
-(defvar notmuch-show-hook '(notmuch-show-pretty-hook)
-  "A list of functions called after populating a
-`notmuch-show' buffer.")
-
-(defvar notmuch-show-insert-text/plain-hook '(notmuch-wash-text/plain-citations)
-  "A list of functions called to clean up text/plain body parts.")
+(defcustom notmuch-show-hook nil
+  "Functions called after populating a `notmuch-show' buffer."
+  :group 'notmuch
+  :type 'hook)
 
-(defun notmuch-show-pretty-hook ()
-  (goto-address-mode 1)
-  (visual-line-mode))
+(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-convert-inline-patch-to-part
+            notmuch-wash-wrap-long-lines
+            notmuch-wash-tidy-citations
+            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"
@@ -185,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)
@@ -197,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)))
 
@@ -401,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)
 
@@ -511,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
@@ -536,7 +556,9 @@ function is used. "
       (let ((map (make-sparse-keymap)))
        (define-key map "?" 'notmuch-help)
        (define-key map "q" 'kill-this-buffer)
+       (define-key map (kbd "<C-tab>") 'widget-backward)
        (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)
@@ -823,8 +845,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)))