emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

* mm: update main view, added bookmark support

This commit is contained in:
djcb 2011-12-03 14:22:30 +02:00
parent fe3449cec5
commit 8823edeed7
4 changed files with 105 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
toys/mm/TODO
View File

@ -1,3 +1,4 @@
* TODO
** Bugs
@ -5,17 +6,16 @@
*** forward should take the attachments from the original
*** database locks
** Features i
*** mark thread
*** version check at startup
*** documentation
*** customizable bookmarks
*** emacs install
** Features ii
*** mark thread
*** bounce support
*** sorting
*** recursive ask-maildir
@ -31,7 +31,6 @@
*** integrate with org-contacts, bbdb
* DONE
** don't put updated messages at the end
** mark region
@ -60,3 +59,9 @@
** view raw message
** Sent Items
** raw-mode / quit
# Local Variables:
# mode: org; org-startup-folded: nil
# End:
** customizable bookmarks
** fix queued sending

15
toys/mm/mm-hdrs.el
View File

@ -247,6 +247,8 @@ after the end of the search results."
(let ((map (make-sparse-keymap)))
(define-key map "s" 'mm/search)
(define-key map "b" 'mm/search-bookmark)
(define-key map "q" 'mm/quit-buffer)
;; (define-key map "o" 'mm/change-sort)
(define-key map "g" 'mm/rerun-search)
@ -342,7 +344,7 @@ after the end of the search results."
mm/marks-map (make-hash-table :size 16 :rehash-size 2)
mm/thread-info-map (make-hash-table :size 512 :rehash-size 2)
major-mode 'mm/hdrs-mode
mode-name "*mm-headers*"
mode-name "mm: message headers"
truncate-lines t
buffer-read-only t
overwrite-mode 'overwrite-mode-binary)
@ -612,6 +614,14 @@ start editing it. COMPOSE-TYPE is either `reply', `forward' or
(when (mm/ignore-marks)
(call-interactively 'mm/hdrs-search)))
(defun mm/search-bookmark ()
"Search using some bookmarked query."
(interactive)
(let ((query (mm/ask-bookmark "Bookmark: ")))
(when query
(mm/hdrs-search query))))
(defun mm/quit-buffer ()
"Quit the current buffer."
(interactive)
@ -662,7 +672,8 @@ return the new docid. Otherwise, return nil."
ask user for it."
(interactive)
(let ((fld (mm/ask-maildir "Jump to maildir: ")))
(mm/hdrs-search (concat "maildir:" fld))))
(when fld
(mm/hdrs-search (concat "maildir:" fld)))))
(defun mm/mark-for-move (&optional target)

3
toys/mm/mm-view.el
View File

@ -204,6 +204,7 @@ or if not available, :body-html converted to text)."
(define-key map "q" 'mm/view-quit-buffer)
(define-key map "s" 'mm/search)
(define-key map "b" 'mm/search-bookmark)
(define-key map "j" 'mm/jump-to-maildir)
(define-key map "g" 'mm/view-go-to-url)
@ -395,7 +396,7 @@ removing '^M' etc."
(make-local-variable 'mm/view-buffer)
(setq major-mode 'mm/view-raw-mode
mode-name mm/view-raw-buffer-name)
mode-name "mm: raw view")
(setq truncate-lines t buffer-read-only t))
(defvar mm/view-raw-mode-map nil

137
toys/mm/mm.el
View File

@ -86,7 +86,6 @@ PATH, you can specify the full path."
used to distinguish ourselves from others, e.g. when replying and
in :from-or-to headers. By default, match nothing.")
(defvar mm/date-format-long "%c"
"Date format to use in the message view, in the format of
`format-time-string'.")
@ -94,18 +93,29 @@ in :from-or-to headers. By default, match nothing.")
(defvar mm/debug nil
"When set to non-nil, log debug information to the *mm-log* buffer.")
(defvar mm/bookmarks
'( ("flag:unread AND NOT flag:trashed" "Unread messages" ?u)
("date:today..now" "Today's messages" ?t)
("date:7d..now" "Last 7 days" ?w)
("mime:image/*" "Messages With Pics" ?p))
"A list of pre-defined queries; these will show up in the main
screen. Each of the list elements is a three-element list of the
form (QUERY DESCRIPTION KEY), where QUERY is a string with a mu
query, DESCRIPTION is a short description of the query (this will
show up in the UI), and KEY is a shortcut key for the query.")
;; Folders
(defgroup mm/folders nil
"Special folders for mm."
:group 'mm)
(defcustom mm/inbox-folder nil
"Your Inbox folder, relative to `mm/maildir', e.g. \"/Inbox\"."
:type 'string
:safe 'stringp
:group 'mm/folders)
;; (defcustom mm/inbox-folder nil
;; "Your Inbox folder, relative to `mm/maildir', e.g. \"/Inbox\"."
;; :type 'string
;; :safe 'stringp
;; :group 'mm/folders)
(defcustom mm/sent-folder nil
"Your folder for sent messages, relative to `mm/maildir',
@ -265,6 +275,11 @@ flag set)."
"Face for showing URLs and attachments in the message view."
:group 'mm/faces)
(defface mm/highlight-face
'((t :inherit font-lock-pseudo-keyword-face :bold t))
"Face for highlighting things."
:group 'mm/faces)
(defface mm/view-url-number-face
'((t :inherit font-lock-reference-face :bold t))
"Face for the number tags for URLs."
@ -319,18 +334,14 @@ in which case it will be equal to `:to'.)")
(defvar mm/mm-mode-map
(let ((map (make-sparse-keymap)))
(define-key map "I" 'mm/jump-to-inbox)
(define-key map "T" 'mm/search-today)
(define-key map "W" 'mm/search-last-7-days)
(define-key map "U" 'mm/search-unread)
(define-key map "D" 'mm/search-drafts)
(define-key map "b" 'mm/search-bookmark)
(define-key map "s" 'mm/search)
(define-key map "q" 'mm/quit-mm)
(define-key map "j" 'mm/jump-to-maildir)
(define-key map "c" 'mm/compose-new)
(define-key map "m" 'mm/toggle-mail-sending-mode)
(define-key map "f" 'smtpmail-send-queued-mail)
(define-key map "u" 'mm/retrieve-mail-update-db)
map)
@ -347,12 +358,20 @@ in which case it will be equal to `:to'.)")
(setq
mm/marks-map (make-hash-table :size 16 :rehash-size 2)
major-mode 'mm/mm-mode
mode-name "*mm*"
mode-name "mm: main view"
truncate-lines t
buffer-read-only t
overwrite-mode 'overwrite-mode-binary))
(defun mm/action-str (str)
"Highlight the first occurence of [..] in STR."
(if (string-match "\\[\\(\\w+\\)\\]" str)
(let* ((key (match-string 1 str))
(keystr (propertize key 'face 'mm/highlight-face)))
(replace-match keystr nil t str 1))
str))
(defun mm()
"Start mm; should not be called directly, instead, use `mm'"
(interactive)
@ -362,58 +381,41 @@ in which case it will be equal to `:to'.)")
(erase-buffer)
(insert
"* "
(propertize "mm - mail for emacs version " 'face 'mm/title-face)
(propertize mm/mu-version 'face 'mm/view-header-value-face)
" (send: "
(propertize (if smtpmail-queue-mail "queued" "direct")
'face 'mm/view-header-key-face)
")"
(propertize "mm - mu mail for emacs version " 'face 'mm/title-face)
(propertize mm/mu-version 'face 'mm/view-header-key-face)
"\n\n"
" Watcha wanna do?\n\n"
" - " (propertize "j" 'face 'highlight) "ump to some maildir\n"
" - " (propertize "s" 'face 'highlight) "earch for a specific message\n"
" - " (propertize "c" 'face 'highlight) "ompose a new message\n"
"\n"
(propertize " Basics\n\n" 'face 'mm/title-face)
(mm/action-str "\t* [j]ump to some maildir\n")
(mm/action-str "\t* enter a [s]earch query\n")
(mm/action-str "\t* [c]ompose a new message\n")
"\n"
(propertize " Bookmarks\n\n" 'face 'mm/title-face)
(mapconcat
(lambda (bm)
(let* ((query (nth 0 bm)) (title (nth 1 bm)) (key (nth 2 bm)))
(mm/action-str
(concat "\t* [b" (make-string 1 key) "] " title))))
mm/bookmarks "\n")
" * " (propertize "u" 'face 'highlight) "pdate email\n"
" * toggle " (propertize "m" 'face 'highlight) "ail sending mode "
"\n"
" * " (propertize "q" 'face 'highlight) "uit mm\n")
(propertize " Misc\n\n" 'face 'mm/title-face)
(mm/action-str "\t* [u]pdate email & database\n")
(mm/action-str "\t* toggle [m]ail sending mode ")
"(" (propertize (if smtpmail-queue-mail "queued" "direct")
'face 'mm/view-header-key-face) ")\n"
(mm/action-str "\t* [f]lush queued mail\n")
"\n"
(mm/action-str "\t* [q]uit mm\n"))
(mm/mm-mode)
(switch-to-buffer buf))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; interactive functions
(defun mm/jump-to-inbox ()
"Jump to your Inbox folder (as specified in `mm/inbox-folder')."
(interactive)
(mm/hdrs-search (concat "maildir:" mm/inbox-folder)))
(defun mm/search-drafts ()
"Jump to your Drafts folder (as specified in `mm/draft-folder')."
(interactive)
(mm/hdrs-search (concat "maildir:" mm/drafts-folder " OR flag:draft")))
(defun mm/search-unread ()
"List all your unread messages."
(interactive)
(mm/hdrs-search "flag:unread AND NOT flag:trashed"))
(defun mm/search-today ()
"List messages received today."
(interactive)
(mm/hdrs-search "date:today..now"))
(defun mm/search-last-7-days ()
"List messages received in the last 7 days."
(interactive)
(mm/hdrs-search "date:7d..now"))
;; Interactive functions
(defun mm/retrieve-mail-update-db ()
"Get new mail and update the database."
@ -424,12 +426,15 @@ in which case it will be equal to `:to'.)")
"Toggle sending mail mode, either queued or direct."
(interactive)
(setq smtpmail-queue-mail (not smtpmail-queue-mail))
(message
(if smtpmail-queue-mail
"Outgoing mail will now be queued"
"Outgoing mail will now be sent directly"))
(mm))
;; General helper functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -458,7 +463,7 @@ in which case it will be equal to `:to'.)")
(defun mm/ask-maildir (prompt)
"Ask the user for a shortcut as defined in
"Ask the user for a shortcut (using PROMPT) as defined in
`mm/maildir-shortcuts', then return the corresponding folder
name. If the special shortcut 'o' (for _o_ther) is used, or if
`mm/maildir-shortcuts is not defined, let user choose from all
@ -484,6 +489,26 @@ maildirs under `mm/maildir."
(error "Invalid shortcut '%c'" kar))))))
(defun mm/ask-bookmark (prompt)
"Ask the user for a bookmark (using PROMPT) as defined in
`mm/bookmarks', then return the corresponding query."
(unless mm/bookmarks (error "`mm/bookmarks' is not defined"))
(let* ((bmarks
(mapconcat
(lambda (bm)
(let ((query (nth 0 bm)) (title (nth 1 bm)) (key (nth 2 bm)))
(concat
"[" (propertize (make-string 1 key) 'face 'mm/view-link-face) "]"
title))) mm/bookmarks ", "))
(kar (read-char (concat prompt bmarks)))
(chosen-bm
(find-if (lambda (bm) (= kar (nth 2 bm))) mm/bookmarks)))
(unless chosen-bm (error "Invalid shortcut '%c'" kar))
(nth 0 chosen-bm)))
(defun mm/new-buffer (bufname)
"Return a new buffer BUFNAME; if such already exists, kill the
old one first."