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

Merge pull request #1320 from jabranham/replace-cl-cl-lib

Browse Source 
mu4e: Replace cl with cl-lib
This commit is contained in:
Dirk-Jan C. Binnema
2019-02-02 13:37:50 +02:00
committed by GitHub
parent eb6efee81d 2674ca5583
commit f57381bf4a
14 changed files with 98 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mu4e/mu4e-compose.el
View File

@ -67,10 +67,8 @@
;;
;;; Code:
(eval-when-compile (byte-compile-disable-warning 'cl-functions))
(require 'cl)
(eval-when-compile
(require 'cl))
(require 'message)
(require 'mail-parse)
(require 'smtpmail)
@ -259,7 +257,7 @@ If needed, set the Fcc header, and register the handler function."
(funcall mu4e-sent-messages-behavior)
mu4e-sent-messages-behavior)))
(mdir
(case sent-behavior
(cl-case sent-behavior
(delete nil)
(trash (mu4e-get-trash-folder mu4e-compose-parent-message))
(sent (mu4e-get-sent-folder mu4e-compose-parent-message))
@ -539,7 +537,7 @@ buffers; lets remap its faces so it uses the ones for mu4e."
(let* ((subj (message-field-value "subject"))
(subj (unless (and subj (string-match "^[:blank:]*$" subj)) subj))
(str (or subj
(case compose-type
(cl-case compose-type
(reply "*reply*")
(forward "*forward*")
(otherwise "*draft*")))))
@ -555,19 +553,20 @@ automatically encrypt that reply. When the message is unencrypted,
we can decide what we want to do."
(if (and (eq compose-type 'reply)
(and parent (member 'encrypted (mu4e-message-field parent :flags))))
(case mu4e-compose-crypto-reply-encrypted-policy
(cl-case mu4e-compose-crypto-reply-encrypted-policy
(sign (mml-secure-message-sign))
(encrypt (mml-secure-message-encrypt))
(sign-and-encrypt (mml-secure-message-sign-encrypt))
(message "Do nothing"))
(case mu4e-compose-crypto-reply-plain-policy
(cl-case mu4e-compose-crypto-reply-plain-policy
(sign (mml-secure-message-sign))
(encrypt (mml-secure-message-encrypt))
(sign-and-encrypt (mml-secure-message-sign-encrypt))
(message "Do nothing")))
)
(defun* mu4e~compose-handler (compose-type &optional original-msg includes)
(cl-defun mu4e~compose-handler (compose-type &optional original-msg includes)
"Create a new draft message, or open an existing one.
COMPOSE-TYPE determines the kind of message to compose and is a
@ -604,7 +603,7 @@ tempfile)."
(mu4e-draft-open compose-type original-msg)
(quit (set-window-configuration winconf)
(mu4e-message "Operation aborted")
(return-from mu4e~compose-handler))))
(cl-return-from mu4e~compose-handler))))
;; insert mail-header-separator, which is needed by message mode to separate
;; headers and body. will be removed before saving to disk
(mu4e~draft-insert-mail-header-separator)
@ -627,7 +626,7 @@ tempfile)."
(if (member compose-type '(new forward))
(message-goto-to)
;; otherwise, it depends...
(case message-cite-reply-position
(cl-case message-cite-reply-position
((above traditional)
(message-goto-body))
(t