emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* replace letf with cl-letf in org-mime
@ 2015-03-22 13:56 Eric Abrahamsen
  2015-03-22 14:16 ` Nicolas Goaziou
  0 siblings, 1 reply; 8+ messages in thread
From: Eric Abrahamsen @ 2015-03-22 13:56 UTC (permalink / raw)
  To: emacs-orgmode

[-- Attachment #1: Type: text/plain, Size: 64 bytes --]

It's amazing what an effect barky compiler errors can have.

E


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Use-cl-flet-rather-than-plain-flet.patch --]
[-- Type: text/x-diff, Size: 1975 bytes --]

From 0bba16a7419d32ecc25ccdf422c9d0e129d0b547 Mon Sep 17 00:00:00 2001
From: Eric Abrahamsen <eric@ericabrahamsen.net>
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


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2015-04-02  1:34 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-22 13:56 replace letf with cl-letf in org-mime Eric Abrahamsen
2015-03-22 14:16 ` Nicolas Goaziou
2015-03-22 14:30   ` Eric Abrahamsen
2015-03-30  8:34   ` Eric Abrahamsen
2015-03-31 10:42     ` Nicolas Goaziou
2015-04-01  2:17       ` Eric Abrahamsen
2015-04-01 19:46         ` Nicolas Goaziou
2015-04-02  1:33           ` Eric Abrahamsen

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).