emacs: restore autoload cookie for notmuch-search

[notmuch] / emacs / notmuch.el

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 43d56f7be499218214d3c5c64e346484e71ac18b..46f14fea1dd0ff112a57e64154cc5e5eeb19ab37 100644 (file)
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -313,7 +313,7 @@ there will be called at other points of notmuch execution."
 
 (defface notmuch-search-flagged-face
   '((t
 
 (defface notmuch-search-flagged-face
   '((t

-     (:weight bold)))
+     (:foreground "blue")))

   "Face used in search mode face for flagged threads.
 
 This face is the default value for the \"flagged\" tag in
   "Face used in search mode face for flagged threads.
 
 This face is the default value for the \"flagged\" tag in


@@ -323,7 +323,7 @@ This face is the default value for the \"flagged\" tag in
 
 (defface notmuch-search-unread-face
   '((t
 
 (defface notmuch-search-unread-face
   '((t

-     (:foreground "blue")))
+     (:weight bold)))

   "Face used in search mode for unread threads.
 
 This face is the default value for the \"unread\" tag in
   "Face used in search mode for unread threads.
 
 This face is the default value for the \"unread\" tag in


@@ -331,7 +331,7 @@ This face is the default value for the \"unread\" tag in
   :group 'notmuch-search
   :group 'notmuch-faces)
 
   :group 'notmuch-search
   :group 'notmuch-faces)
 

-(defun notmuch-search-mode ()
+(define-derived-mode notmuch-search-mode fundamental-mode "notmuch-search"

   "Major mode displaying results of a notmuch search.
 
 This buffer contains the results of a \"notmuch search\" of your
   "Major mode displaying results of a notmuch search.
 
 This buffer contains the results of a \"notmuch search\" of your


@@ -361,8 +361,6 @@ new, global search.
 Complete list of currently available key bindings:
 
 \\{notmuch-search-mode-map}"
 Complete list of currently available key bindings:
 
 \\{notmuch-search-mode-map}"

-  (interactive)
-  (kill-all-local-variables)

   (make-local-variable 'notmuch-search-query-string)
   (make-local-variable 'notmuch-search-oldest-first)
   (make-local-variable 'notmuch-search-target-thread)
   (make-local-variable 'notmuch-search-query-string)
   (make-local-variable 'notmuch-search-oldest-first)
   (make-local-variable 'notmuch-search-target-thread)


@@ -370,10 +368,7 @@ Complete list of currently available key bindings:
   (setq notmuch-buffer-refresh-function #'notmuch-search-refresh-view)
   (set (make-local-variable 'scroll-preserve-screen-position) t)
   (add-to-invisibility-spec (cons 'ellipsis t))
   (setq notmuch-buffer-refresh-function #'notmuch-search-refresh-view)
   (set (make-local-variable 'scroll-preserve-screen-position) t)
   (add-to-invisibility-spec (cons 'ellipsis t))

-  (use-local-map notmuch-search-mode-map)

   (setq truncate-lines t)
   (setq truncate-lines t)

-  (setq major-mode 'notmuch-search-mode
-       mode-name "notmuch-search")

   (setq buffer-read-only t))
 
 (defun notmuch-search-get-result (&optional pos)
   (setq buffer-read-only t))
 
 (defun notmuch-search-get-result (&optional pos)


@@ -674,9 +669,16 @@ of the result."
                  (goto-char (point-min))
                  (forward-line (1- notmuch-search-target-line)))))))))
 
                  (goto-char (point-min))
                  (forward-line (1- notmuch-search-target-line)))))))))
 

+(define-widget 'notmuch--custom-face-edit 'lazy
+  "Custom face edit with a tag Edit Face"
+  ;; I could not persuage custom-face-edit to respect the :tag
+  ;; property so create a widget specially
+  :tag "Manually specify face"
+  :type 'custom-face-edit)
+

 (defcustom notmuch-search-line-faces
 (defcustom notmuch-search-line-faces

-  '(("unread" 'notmuch-search-unread-face)
-    ("flagged" 'notmuch-search-flagged-face))
+  '(("unread" . notmuch-search-unread-face)
+    ("flagged" . notmuch-search-flagged-face))

   "Alist of tags to faces for line highlighting in notmuch-search.
 Each element looks like (TAG . FACE).
 A thread with TAG will have FACE applied.
   "Alist of tags to faces for line highlighting in notmuch-search.
 Each element looks like (TAG . FACE).
 A thread with TAG will have FACE applied.


@@ -694,19 +696,20 @@ matching tags are merged, with earlier attributes overriding
 later. A message having both \"deleted\" and \"unread\" tags with
 the above settings would have a green foreground and blue
 background."
 later. A message having both \"deleted\" and \"unread\" tags with
 the above settings would have a green foreground and blue
 background."

-  :type '(alist :key-type (string) :value-type (custom-face-edit))
+  :type '(alist :key-type (string)
+               :value-type (radio (face :tag "Face name")
+                                   (notmuch--custom-face-edit)))

   :group 'notmuch-search
   :group 'notmuch-faces)
 
 (defun notmuch-search-color-line (start end line-tag-list)
   "Colorize lines in `notmuch-show' based on tags."
   :group 'notmuch-search
   :group 'notmuch-faces)
 
 (defun notmuch-search-color-line (start end line-tag-list)
   "Colorize lines in `notmuch-show' based on tags."

-  (mapc (lambda (elem)
-         (let ((tag (car elem))
-               (attributes (cdr elem)))
-           (when (member tag line-tag-list)
-             (notmuch-apply-face nil attributes nil start end))))
-       ;; Reverse the list so earlier entries take precedence
-       (reverse notmuch-search-line-faces)))
+  ;; Reverse the list so earlier entries take precedence
+  (dolist (elem (reverse notmuch-search-line-faces))
+    (let ((tag (car elem))
+         (face (cdr elem)))
+      (when (member tag line-tag-list)
+       (notmuch-apply-face nil face nil start end)))))

 
 (defun notmuch-search-author-propertize (authors)
   "Split `authors' into matching and non-matching authors and
 
 (defun notmuch-search-author-propertize (authors)
   "Split `authors' into matching and non-matching authors and


@@ -928,8 +931,8 @@ PROMPT is the string to prompt with."
   "Return the current query in this search buffer"
   notmuch-search-query-string)
 
   "Return the current query in this search buffer"
   notmuch-search-query-string)
 

-;;;###autoload

 (put 'notmuch-search 'notmuch-doc "Search for messages.")
 (put 'notmuch-search 'notmuch-doc "Search for messages.")

+;;;###autoload

 (defun notmuch-search (&optional query oldest-first target-thread target-line)
   "Display threads matching QUERY in a notmuch-search buffer.
 
 (defun notmuch-search (&optional query oldest-first target-thread target-line)
   "Display threads matching QUERY in a notmuch-search buffer.
 


@@ -1055,8 +1058,9 @@ current search results AND that are tagged with the given tag."
   (with-current-buffer b
     (memq major-mode '(notmuch-show-mode
                       notmuch-search-mode
   (with-current-buffer b
     (memq major-mode '(notmuch-show-mode
                       notmuch-search-mode

+                      notmuch-tree-mode

                       notmuch-hello-mode
                       notmuch-hello-mode

-                      message-mode))))
+                      notmuch-message-mode))))

 
 ;;;###autoload
 (defun notmuch-cycle-notmuch-buffers ()
 
 ;;;###autoload
 (defun notmuch-cycle-notmuch-buffers ()