alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu4e.el: update defaults, check required variables are set

Browse Source
This commit is contained in:
djcb
2011-12-29 01:25:17 +02:00
parent a051587581
commit 955405050a
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
emacs/mu4e.el
View File

@ -163,7 +163,7 @@ designated shortcut character for the maildir.")
'( (:date . 25) '( (:date . 25)
(:flags . 6) (:flags . 6)
(:from . 22) (:from . 22)
(:subject . 40)) (:subject . nil))
"A list of header fields to show in the headers buffer, and their "A list of header fields to show in the headers buffer, and their
respective widths in characters. A width of `nil' means respective widths in characters. A width of `nil' means
'unrestricted', and this is best reserved fo the rightmost (last) 'unrestricted', and this is best reserved fo the rightmost (last)
@ -338,7 +338,7 @@ view). Most fields should be self-explanatory. A special one is
`:from-or-to', which is equal to `:from' unless `:from' matches , `:from-or-to', which is equal to `:from' unless `:from' matches ,
in which case it will be equal to `:to'.)") in which case it will be equal to `:to'.)")
;; mm startup function ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; mm startup function ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defun mu4e () (defun mu4e ()
"Start mm. We do this by sending a 'ping' to the mu server "Start mm. We do this by sending a 'ping' to the mu server
@ -347,6 +347,11 @@ server has the expected values."
(interactive) (interactive)
(if (buffer-live-p (get-buffer mu4e-main-buffer-name)) (if (buffer-live-p (get-buffer mu4e-main-buffer-name))
(switch-to-buffer mu4e-main-buffer-name) (switch-to-buffer mu4e-main-buffer-name)
(dolist (var '(mu4e-maildir mu4e-inbox-folder mu4e-outbox-folder
mu4e-outbox-folder mu4e-sent-folder mu4e-drafts-folder
mu4e-trash-folder))
(unless (and (boundp var) (symbol-value var))
(error "Please set %S" var)))
;; explicit version checks are a bit questionable, ;; explicit version checks are a bit questionable,
;; better to check for specific features ;; better to check for specific features
(if (< emacs-major-version 23) (if (< emacs-major-version 23)
@ -412,7 +417,7 @@ maildirs under `mu4e-maildir."
(defun mu4e-ask-bookmark (prompt) (defun mu4e-ask-bookmark (prompt &optional kar)
"Ask the user for a bookmark (using PROMPT) as defined in "Ask the user for a bookmark (using PROMPT) as defined in
`mu4e-bookmarks', then return the corresponding query." `mu4e-bookmarks', then return the corresponding query."
(unless mu4e-bookmarks (error "`mu4e-bookmarks' is not defined")) (unless mu4e-bookmarks (error "`mu4e-bookmarks' is not defined"))
@ -423,13 +428,20 @@ maildirs under `mu4e-maildir."
(concat (concat
"[" (propertize (make-string 1 key) 'face 'mu4e-view-link-face) "]" "[" (propertize (make-string 1 key) 'face 'mu4e-view-link-face) "]"
title))) mu4e-bookmarks ", ")) title))) mu4e-bookmarks ", "))
(kar (read-char (concat prompt bmarks))) (kar (read-char (concat prompt bmarks))))
(chosen-bm (mu4e-get-bookmark-query kar)))
(find-if (lambda (bm) (= kar (nth 2 bm))) mu4e-bookmarks)))
(unless chosen-bm (error "Invalid shortcut '%c'" kar))
(nth 0 chosen-bm)))
(defun mu4e-get-bookmark-query (kar)
"Get the corresponding bookmarked query for shortcut character
KAR, or raise an error if none is found."
(let ((chosen-bm
(find-if
(lambda (bm)
(= kar (nth 2 bm)))
mu4e-bookmarks)))
(if chosen-bm
(nth 0 chosen-bm)
(error "Invalid shortcut '%c'" kar))))
(defun mu4e-new-buffer (bufname) (defun mu4e-new-buffer (bufname)
"Return a new buffer BUFNAME; if such already exists, kill the "Return a new buffer BUFNAME; if such already exists, kill the