From 0bba16a7419d32ecc25ccdf422c9d0e129d0b547 Mon Sep 17 00:00:00 2001 From: Eric Abrahamsen Date: Sun, 22 Mar 2015 21:39:57 +0800 Subject: [PATCH] Use `cl-flet' rather than plain `flet' * contrib/lisp/org-mime.el (org-mime-send-subtree, org-mime-compose): The compiler complains otherwise. --- contrib/lisp/org-mime.el | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/lisp/org-mime.el b/contrib/lisp/org-mime.el index f341474..9f18dc6 100644 --- a/contrib/lisp/org-mime.el +++ b/contrib/lisp/org-mime.el @@ -252,7 +252,7 @@ export that region, otherwise export the entire body." (save-restriction (org-narrow-to-subtree) (run-hooks 'org-mime-send-subtree-hook) - (flet ((mp (p) (org-entry-get nil p org-mime-use-property-inheritance))) + (cl-flet ((mp (p) (org-entry-get nil p org-mime-use-property-inheritance))) (let* ((file (buffer-file-name (current-buffer))) (subject (or (mp "MAIL_SUBJECT") (nth 4 (org-heading-components)))) (to (mp "MAIL_TO")) @@ -287,17 +287,17 @@ export that region, otherwise export the entire body." (require 'message) (message-mail to subject headers nil) (message-goto-body) - (flet ((bhook (body fmt) - (let ((hook (intern (concat "org-mime-pre-" - (symbol-name fmt) - "-hook")))) - (if (> (eval `(length ,hook)) 0) - (with-temp-buffer - (insert body) - (goto-char (point-min)) - (eval `(run-hooks ',hook)) - (buffer-string)) - body)))) + (cl-flet ((bhook (body fmt) + (let ((hook (intern (concat "org-mime-pre-" + (symbol-name fmt) + "-hook")))) + (if (> (eval `(length ,hook)) 0) + (with-temp-buffer + (insert body) + (goto-char (point-min)) + (eval `(run-hooks ',hook)) + (buffer-string)) + body)))) (let ((fmt (if (symbolp fmt) fmt (intern fmt)))) (cond ((eq fmt 'org) -- 2.3.3