Merge pull request #113 from tarsius/custom

* various improvements for 'defcustom' usage and explicitly offer `turn-on-visual-line-mode' as hook function.

mu4e/mu4e-compose.el

@@ -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
+Note, when using GMail/IMAP, you should set this to either
-or 'delete, since GMail already takes care of keeping copies in the
+`trash' or `delete', since GMail already takes care of keeping
-sent folder."
+copies in the sent folder."
-  :type '(choice (const sent :tag "move message to mu4e-sent-folder")
+  :type '(choice (const :tag "move message to mu4e-sent-folder" sent)
-		 (const sent :tag "move message to mu4e-trash-folder")
+		 (const :tag "move message to mu4e-trash-folder" trash)
-		 (const sent :tag "delete message"))
+		 (const :tag "delete message" delete))
   :safe 'symbolp
   :group 'mu4e-compose)
 

mu4e/mu4e-utils.el

@@ -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
+`mu4e-maildir-shortcuts' is not defined, let user choose from all
-maildirs under `mu4e-maildir."
+maildirs under `mu4e-maildir'."
   (let ((prompt (mu4e-format "%s" prompt)))
     (if (not mu4e-maildir-shortcuts)
       (ido-completing-read prompt (mu4e-get-maildirs))

mu4e/mu4e-vars.el

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

mu4e/mu4e-view.el

@@ -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.