From faa0e6f55ffd479c310d2fcfce110aec2749004b Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Wed, 12 Dec 2012 20:03:36 +0100
Subject: [PATCH 1/3] mu4e-sent-messages-behavior: fix custom type defintion

---
 mu4e/mu4e-compose.el | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el
index 7cc94abc..3b17d795 100644
--- a/mu4e/mu4e-compose.el
+++ b/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
-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)
 

From cd5f7302224e3b871cba3001cc60d557d89946ce Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Wed, 12 Dec 2012 20:04:23 +0100
Subject: [PATCH 2/3] mu4e-maildir-shortcuts: define custom type

---
 mu4e/mu4e-utils.el |  4 ++--
 mu4e/mu4e-vars.el  | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/mu4e/mu4e-utils.el b/mu4e/mu4e-utils.el
index 1f9627d5..1cbf336c 100644
--- a/mu4e/mu4e-utils.el
+++ b/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
-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))
diff --git a/mu4e/mu4e-vars.el b/mu4e/mu4e-vars.el
index eb1d2080..5cddcdba 100644
--- a/mu4e/mu4e-vars.el
+++ b/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
-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

From 4e6824dd690a626c8b50003ab5b459923615b5bb Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Wed, 12 Dec 2012 20:05:57 +0100
Subject: [PATCH 3/3] mu4e-view-mode-hook: define explicitly

Explicit offer `turn-on-visual-line-mode' as hook function.
---
 mu4e/mu4e-view.el | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mu4e/mu4e-view.el b/mu4e/mu4e-view.el
index 11963b48..15ac911a 100644
--- a/mu4e/mu4e-view.el
+++ b/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.