From: "Łukasz Stelmach" <lukasz.stelmach@iem.pw.edu.pl>
To: emacs-orgmode@gnu.org
Subject: [PATCH] sexp may retrurn a list
Date: Tue, 19 Oct 2010 15:38:48 +0200 [thread overview]
Message-ID: <87hbgicnfb.fsf@dasa3.iem.pw.edu.pl> (raw)
Hi.
I've disovered, that %%(org-bbdb-anniversaries) returns (as every other
sexp) a string. Which is OK if there is only one.
Anniversaries: John Doe's 10th wedding anniversary
Unfortunately the agenda view becomes awful if we have noted Jane's
weeding date too
Anniversaries: John Doe's 10th wedding anniversary; Jane Doe's 10th wedding anniversary
And what if we know 3 Eves and 5 Adams and it's Christmas Eve? (Hint:
their name day)
So i decided to introduce little modifications so that a sexp may return
a list of strings and org-agenda-get-sexps and org-diary-sexp-entry
functions accept that. I've modified org-bbdb-anniversaries too, so it
returns a list no matter how many anniversaries there are on a
particular day.
It looks better now, doesn't it?
Anniversaries: John Doe's 10th wedding anniversary
Anniversaries: Jane Doe's 10th wedding anniversary
The patch is backward compatible of course and if a sexp returns a
string than the output is the same as it used to be.
Behold The Patch:
--8<---------------cut here---------------start------------->8---
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index ede62e8..8544a62 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4499,17 +4499,20 @@ the documentation of `org-diary'."
category (org-get-category beg)
todo-state (org-get-todo-state))
- (if (string-match "\\S-" result)
- (setq txt result)
- (setq txt "SEXP entry returned empty string"))
-
- (setq txt (org-format-agenda-item
- "" txt category tags 'time))
- (org-add-props txt props 'org-marker marker)
- (org-add-props txt nil
- 'org-category category 'date date 'todo-state todo-state
- 'type "sexp")
- (push txt ee))))
+ (dolist (r (if (stringp result)
+ (list result)
+ result)) ;; we expect a list here
+ (if (string-match "\\S-" r)
+ (setq txt r)
+ (setq txt "SEXP entry returned empty string"))
+
+ (setq txt (org-format-agenda-item
+ "" txt category tags 'time))
+ (org-add-props txt props 'org-marker marker)
+ (org-add-props txt nil
+ 'org-category category 'date date 'todo-state todo-state
+ 'type "sexp")
+ (push txt ee)))))
(nreverse ee)))
(defun org-diary-class (m1 d1 y1 m2 d2 y2 dayname &rest skip-weeks)
diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el
index 53514f7..0d3134d 100644
--- a/lisp/org-bbdb.el
+++ b/lisp/org-bbdb.el
@@ -338,8 +338,7 @@ This is used by Org to re-create the anniversary hash table."
(setq text (append text (list tmp)))
(setq text (list tmp)))))
))
- (when text
- (mapconcat 'identity text "; "))))
+ text))
(defun org-bbdb-complete-link ()
"Read a bbdb link with name completion."
diff --git a/lisp/org.el b/lisp/org.el
index 6ea9d25..62ccf1c 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -15020,7 +15020,7 @@ D may be an absolute day number, or a calendar-type list (month day year)."
(org-current-line)
(buffer-file-name) sexp)
(sleep-for 2))))))
- (cond ((stringp result) result)
+ (cond ((or (listp result) (stringp result)) result)
((and (consp result)
(stringp (cdr result))) (cdr result))
(result entry)
--8<---------------cut here---------------end--------------->8---
--
Miłego dnia,
Łukasz Stelmach
next reply other threads:[~2010-10-19 13:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-19 13:38 Łukasz Stelmach [this message]
2010-10-24 20:01 ` [PATCH] sexp may retrurn a list Łukasz Stelmach
2010-10-26 5:28 ` 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=87hbgicnfb.fsf@dasa3.iem.pw.edu.pl \
--to=lukasz.stelmach@iem.pw.edu.pl \
--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).