mu4e: fix some byte-compiler warnings

mu4e/mu4e-contacts.el

@@ -281,7 +281,7 @@ For testing/debugging."
 (declare-function mu4e--server-contacts  "mu4e-server")
 
 (defun mu4e--request-contacts-maybe ()
-  "Maybe update the set of contacts for autocompletion. 
+  "Maybe update the set of contacts for autocompletion.
 
 If `mu4e-compose-complete-addresses' is non-nil, get/update the
 list of contacts we use for autocompletion; otherwise, do

mu4e/mu4e-draft.el

@@ -349,17 +349,17 @@ address is set, use that, otherwise use the From address. Note,
 whatever was in the To: field before, goes to the Cc:-list (if
 we're doing a reply-to-all). Special case: if we were the sender
 of the original, we simple copy the list form the original."
-  (let ((reply-to
-         (or (plist-get origmsg :reply-to) (plist-get origmsg :from))))
-    (cl-delete-duplicates reply-to :test #'mu4e~draft-address-cell-equal)
+  (let* ((reply-to
+          (or (plist-get origmsg :reply-to) (plist-get origmsg :from)))
+         (reply-to
+          (cl-delete-duplicates reply-to :test #'mu4e~draft-address-cell-equal)))
     (if mu4e-compose-dont-reply-to-self
         (cl-delete-if
          (lambda (to-cell)
            (mu4e-personal-address-p (mu4e-contact-email to-cell)))
          reply-to)
       reply-to)))
 
-
 (defun mu4e~strip-ignored-addresses (addrs)
   "Return all addresses that are not to be ignored.
 I.e. return all the addresses in ADDRS not matching

mu4e/mu4e-mark.el

@@ -45,9 +45,9 @@ Value is one of the following symbols:
 - `ask'     ask user whether to ignore the marks
 - `apply'   automatically apply the marks before doing anything else
 - `ignore'  automatically ignore the marks without asking"
-  :type '(choice (const ask    :tag "ask user whether to ignore marks")
-                 (const apply  :tag "apply marks without asking")
-                 (const ignore :tag "ignore marks without asking"))
+  :type '(choice (const :tag "ask user whether to ignore marks" ask)
+                 (const :tag "apply marks without asking" apply)
+                 (const :tag "ignore marks without asking" ignore))
   :group 'mu4e-headers)
 
 (defcustom mu4e-mark-execute-pre-hook nil

mu4e/mu4e-server.el

@@ -207,8 +207,8 @@ Checks whether the server process is live."
              '(run open listen connect stop)) t))
 
 (defsubst mu4e--server-eat-sexp-from-buf ()
-  "'Eat' the next s-expression from `mu4e--server-buf'.
-Note: this is a string, not an emacs-buffer. `mu4e--server-buf gets
+  "Eat the next s-expression from `mu4e--server-buf'.
+Note: this is a string, not an emacs-buffer. `mu4e--server-buf' gets
 its contents from the mu-servers in the following form:
    <`mu4e--server-cookie-pre'><length-in-hex><`mu4e--server-cookie-post'>
 Function returns this sexp, or nil if there was none.