Merge pull request #113 from tarsius/custom

* various improvements for 'defcustom' usage and explicitly offer `turn-on-visual-line-mode' as hook function.
This commit is contained in:
Dirk-Jan C. Binnema 2012-12-15 02:42:06 -08:00
commit 17f3ef0c4b
4 changed files with 25 additions and 17 deletions

View File

@ -97,12 +97,12 @@ This is one of the symbols:
* `trash' move the sent message to the Trash-folder (`mu4e-trash-folder')
* `delete' delete the sent message.
Note, when using GMail/IMAP, you should set this to either 'trash
or 'delete, since GMail already takes care of keeping copies in the
sent folder."
:type '(choice (const sent :tag "move message to mu4e-sent-folder")
(const sent :tag "move message to mu4e-trash-folder")
(const sent :tag "delete message"))
Note, when using GMail/IMAP, you should set this to either
`trash' or `delete', since GMail already takes care of keeping
copies in the sent folder."
:type '(choice (const :tag "move message to mu4e-sent-folder" sent)
(const :tag "move message to mu4e-trash-folder" trash)
(const :tag "delete message" delete))
:safe 'symbolp
:group 'mu4e-compose)

View File

@ -280,8 +280,8 @@ the list of maildirs will not change until you restart mu4e."
"Ask the user for a shortcut (using PROMPT) as defined in
`mu4e-maildir-shortcuts', then return the corresponding folder
name. If the special shortcut 'o' (for _o_ther) is used, or if
`mu4e-maildir-shortcuts is not defined, let user choose from all
maildirs under `mu4e-maildir."
`mu4e-maildir-shortcuts' is not defined, let user choose from all
maildirs under `mu4e-maildir'."
(let ((prompt (mu4e-format "%s" prompt)))
(if (not mu4e-maildir-shortcuts)
(ido-completing-read prompt (mu4e-get-maildirs))

View File

@ -293,15 +293,17 @@ re-edited, and is nil otherwise."
(defcustom mu4e-maildir-shortcuts nil
"A list of maildir shortcuts to enable quickly going to the
particular for, or quickly moving messages towards them (i.e.,
archiving or refiling). The list contains elements of the form
\(maildir . shortcut), where MAILDIR is a maildir (such as
\"/archive/\"), and shortcut a single shortcut character. With
this, in the header buffer and view buffer you can execute
`mu4e-mark-for-move-quick' (or 'm', by default) or
`mu4e-jump-to-maildir' (or 'j', by default), followed by the
designated shortcut character for the maildir.")
"A list of maildir shortcuts.
This enables quickly going to the particular for, or quickly
moving messages towards them (i.e., archiving or refiling). The
list contains elements of the form (maildir . shortcut), where
MAILDIR is a maildir (such as \"/archive/\"), and shortcut a
single shortcut character. With this, in the header buffer and
view buffer you can execute `mu4e-mark-for-move-quick' (or 'm',
by default) or `mu4e-jump-to-maildir' (or 'j', by default),
followed by the designated shortcut character for the maildir."
:type '(repeat (cons (string :tag "Maildir") character))
:group 'mu4e-folders)
;; Faces
(defgroup mu4e-faces nil

View File

@ -656,6 +656,12 @@ FUNC should be a function taking two arguments:
(fset 'mu4e-view-mode-map mu4e-view-mode-map)
(defcustom mu4e-view-mode-hook nil
"Hook run when entering Mu4e-View mode."
:options '(turn-on-visual-line-mode)
:type 'hook
:group 'mu4e-view)
(defvar mu4e-view-mode-abbrev-table nil)
(define-derived-mode mu4e-view-mode special-mode "mu4e:view"
"Major mode for viewing an e-mail message in mu4e.