debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 20:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: JSON based implementation

Browse source 
Re-implement notmuch-show.el using the JSON output format of the
notmuch command. Most functionality is retained - HTML display is
noticeably missing.
This commit is contained in:
David Edmondson 2010-04-11 08:58:43 +01:00 committed by Carl Worth
parent 55d06f3e0b
commit e26d767897
3 changed files with 853 additions and 881 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
emacs/notmuch-lib.el
View file

@ -24,17 +24,6 @@
(defvar notmuch-command "notmuch" (defvar notmuch-command "notmuch"
"Command to run the notmuch binary.") "Command to run the notmuch binary.")
(declare-function notmuch-toggle-invisible-action "notmuch" (cite-button))
(define-button-type 'notmuch-button-invisibility-toggle-type
'action 'notmuch-toggle-invisible-action
'follow-link t
'face 'font-lock-comment-face)
(define-button-type 'notmuch-button-headers-toggle-type
'help-echo "mouse-1, RET: Show headers"
:supertype 'notmuch-button-invisibility-toggle-type)
;; XXX: This should be a generic function in emacs somewhere, not ;; XXX: This should be a generic function in emacs somewhere, not
;; here. ;; here.
(defun point-invisible-p () (defun point-invisible-p ()

1654
emacs/notmuch-show.el
View file

File diff suppressed because it is too large Load diff

69
emacs/notmuch.el
View file

@ -108,58 +108,6 @@
(forward-line))) (forward-line)))
(message-mode)) (message-mode))
(defun notmuch-toggle-invisible-action (cite-button)
(let ((invis-spec (button-get cite-button 'invisibility-spec)))
(if (invisible-p invis-spec)
(remove-from-invisibility-spec invis-spec)
(add-to-invisibility-spec invis-spec)
))
(force-window-update)
(redisplay t))
(define-button-type 'notmuch-button-citation-toggle-type 'help-echo "mouse-1, RET: Show citation"
:supertype 'notmuch-button-invisibility-toggle-type)
(define-button-type 'notmuch-button-signature-toggle-type 'help-echo "mouse-1, RET: Show signature"
:supertype 'notmuch-button-invisibility-toggle-type)
(define-button-type 'notmuch-button-body-toggle-type
'help-echo "mouse-1, RET: Show message"
'face 'notmuch-message-summary-face
:supertype 'notmuch-button-invisibility-toggle-type)
(defun notmuch-fontify-headers ()
(while (looking-at "[[:space:]]")
(forward-char))
(if (looking-at "[Tt]o:")
(progn
(overlay-put (make-overlay (point) (re-search-forward ":"))
'face 'message-header-name)
(overlay-put (make-overlay (point) (re-search-forward ".*$"))
'face 'message-header-to))
(if (looking-at "[B]?[Cc][Cc]:")
(progn
(overlay-put (make-overlay (point) (re-search-forward ":"))
'face 'message-header-name)
(overlay-put (make-overlay (point) (re-search-forward ".*$"))
'face 'message-header-cc))
(if (looking-at "[Ss]ubject:")
(progn
(overlay-put (make-overlay (point) (re-search-forward ":"))
'face 'message-header-name)
(overlay-put (make-overlay (point) (re-search-forward ".*$"))
'face 'message-header-subject))
(if (looking-at "[Ff]rom:")
(progn
(overlay-put (make-overlay (point) (re-search-forward ":"))
'face 'message-header-name)
(overlay-put (make-overlay (point) (re-search-forward ".*$"))
'face 'message-header-other))
(if (looking-at "[Dd]ate:")
(progn
(overlay-put (make-overlay (point) (re-search-forward ":"))
'face 'message-header-name)
(overlay-put (make-overlay (point) (re-search-forward ".*$"))
'face 'message-header-other))))))))
(defun notmuch-documentation-first-line (symbol) (defun notmuch-documentation-first-line (symbol)
"Return the first line of the documentation string for SYMBOL." "Return the first line of the documentation string for SYMBOL."
(let ((doc (documentation symbol))) (let ((doc (documentation symbol)))
@ -435,18 +383,19 @@ Complete list of currently available key bindings:
"Display the currently selected thread." "Display the currently selected thread."
(interactive) (interactive)
(let ((thread-id (notmuch-search-find-thread-id)) (let ((thread-id (notmuch-search-find-thread-id))
(subject (notmuch-search-find-subject)) (subject (notmuch-search-find-subject)))
buffer-name)
(when (string-match "^[ \t]*$" subject)
(setq subject "[No Subject]"))
(setq buffer-name (concat "*"
(truncate-string-to-width subject 32 nil nil t)
"*"))
(if (> (length thread-id) 0) (if (> (length thread-id) 0)
(notmuch-show thread-id (notmuch-show thread-id
(current-buffer) (current-buffer)
notmuch-search-query-string notmuch-search-query-string
buffer-name) ;; name the buffer based on notmuch-search-find-subject
(if (string-match "^[ \t]*$" subject)
"[No Subject]"
(truncate-string-to-width
(concat "*"
(truncate-string-to-width subject 32 nil nil t)
"*")
32 nil nil t)))
(error "End of search results")))) (error "End of search results"))))
(defun notmuch-search-reply-to-thread () (defun notmuch-search-reply-to-thread ()