From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Abrahamsen Subject: replace letf with cl-letf in org-mime Date: Sun, 22 Mar 2015 21:56:13 +0800 Message-ID: <87wq29m8zm.fsf@ericabrahamsen.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34495) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZgQG-00032O-5I for emacs-orgmode@gnu.org; Sun, 22 Mar 2015 10:00:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YZgQB-0002sY-74 for emacs-orgmode@gnu.org; Sun, 22 Mar 2015 10:00:12 -0400 Received: from plane.gmane.org ([80.91.229.3]:59005) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZgQB-0002qp-0d for emacs-orgmode@gnu.org; Sun, 22 Mar 2015 10:00:07 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YZgQ7-0007fj-8B for emacs-orgmode@gnu.org; Sun, 22 Mar 2015 15:00:03 +0100 Received: from 123.123.17.56 ([123.123.17.56]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 22 Mar 2015 15:00:03 +0100 Received: from eric by 123.123.17.56 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 22 Mar 2015 15:00:03 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain It's amazing what an effect barky compiler errors can have. E --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Use-cl-flet-rather-than-plain-flet.patch >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 --=-=-=--