From: "Peter Münster" <pmlists@free.fr>
To: emacs-orgmode@gnu.org
Subject: [PATCH 1/2] org-notify: Don't use obsolete flet and macrolet
Date: Tue, 18 Jun 2013 22:22:29 +0200 [thread overview]
Message-ID: <1371586950-20217-1-git-send-email-pmlists@free.fr> (raw)
* contrib/lisp/org-notify.el (org-notify-make-todo)
(org-notify-process, org-notify-on-action-button)
(org-notify-action-email, org-notify-action-window): Replace `flet'
and `macrolet' by `cl-flet' and `cl-macrolet'.
---
contrib/lisp/org-notify.el | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/contrib/lisp/org-notify.el b/contrib/lisp/org-notify.el
index 4047448..3019852 100644
--- a/contrib/lisp/org-notify.el
+++ b/contrib/lisp/org-notify.el
@@ -118,7 +118,7 @@ simple timestamp string."
(defun org-notify-make-todo (heading &rest ignored)
"Create one todo item."
- (macrolet ((get (k) `(plist-get list ,k))
+ (cl-macrolet ((get (k) `(plist-get list ,k))
(pr (k v) `(setq result (plist-put result ,k ,v))))
(let* ((list (nth 1 heading)) (notify (or (get :notify) "default"))
(deadline (org-notify-convert-deadline (get :deadline)))
@@ -157,7 +157,7 @@ PERIOD."
(defun org-notify-process ()
"Process the todo-list, and possibly notify user about upcoming or
forgotten tasks."
- (macrolet ((prm (k) `(plist-get prms ,k)) (td (k) `(plist-get todo ,k)))
+ (cl-macrolet ((prm (k) `(plist-get prms ,k)) (td (k) `(plist-get todo ,k)))
(dolist (todo (org-notify-todo-list))
(let* ((deadline (td :deadline)) (heading (td :heading))
(uid (td :uid)) (last-run-sym
@@ -268,7 +268,7 @@ seconds. The default value for SECS is 20."
(defun org-notify-on-action-button (button)
"User wants to see action after button activation."
- (macrolet ((get (k) `(button-get button ,k)))
+ (cl-macrolet ((get (k) `(button-get button ,k)))
(org-notify-on-action (get 'plist) (get 'key))
(org-notify-delete-window (get 'buffer))
(cancel-timer (get 'timer))))
@@ -311,7 +311,7 @@ seconds. The default value for SECS is 20."
(compose-mail user-mail-address (concat "TODO: " (plist-get plist :heading)))
(insert (org-notify-body-text plist))
(funcall send-mail-function)
- (flet ((yes-or-no-p (prompt) t))
+ (cl-flet ((yes-or-no-p (prompt) t))
(kill-buffer)))
(defun org-notify-select-highest-window ()
@@ -334,7 +334,7 @@ org-notify window. Mostly copied from `appt-select-lowest-window'."
(defun org-notify-action-window (plist)
"Pop up a window, mostly copied from `appt-disp-window'."
(save-excursion
- (macrolet ((get (k) `(plist-get plist ,k)))
+ (cl-macrolet ((get (k) `(plist-get plist ,k)))
(let ((this-window (selected-window))
(buf (get-buffer-create
(format org-notify-window-buffer-name (get :uid)))))
--
1.8.1.4
next reply other threads:[~2013-06-18 20:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-18 20:22 Peter Münster [this message]
2013-06-18 20:22 ` [PATCH 2/2] org-notify: Fix compatibility with latest org-element (uppercase properties) Peter Münster
2013-06-27 14:42 ` Bastien
2013-06-27 16:41 ` Peter Münster
2013-06-18 21:11 ` [PATCH 1/2] org-notify: Don't use obsolete flet and macrolet David Engster
2013-06-18 23:03 ` Peter Münster
2013-06-19 17:14 ` Achim Gratz
2013-06-19 18:46 ` David Engster
2013-06-20 9:51 ` Carsten Dominik
2013-06-20 11:52 ` Peter Münster
2013-08-31 6:32 ` Carsten Dominik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1371586950-20217-1-git-send-email-pmlists@free.fr \
--to=pmlists@free.fr \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).