ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
org-mode/lisp
History
Łukasz Stelmach 47107b6612 Sexp diary entries may retrurn a list 
* lisp/org-agenda.el (org-agenda-get-sexps): Handle lists as return values
from diary entries
* lisp/org-bbdb.el (org-bbdb-anniversaries): Handle lists of anniversaries
* lisp/org.el (org-diary-sexp-entry): Handle lists as return values
from diary entries.

 ukasz Stelmach <lukasz.stelmach@iem.pw.edu.pl> writes:

> 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)
[...]

As Thomas Bauman pointed out, there are functions that can be used in
sexps which return cons cells like this

    (nil . "Full Moon 3:35am (CEST)")

(this one is diary-lunar-phases), these aren't properly supported by the
previous version of my patch. This one can distinguish between such a
cons cell and a "real" list.

    ("John Doe's 10th wedding anniversary"
     "Jane Doe's 10th wedding anniversary")

This is because

    (consp (cdr '(a . b))) ; => nil

so org-diary-sexp-entry can be made return (cdr result) only in case of
the former cons cell. The third condition in the `cond' block is IMHO
enough as it is now, but if you think adding

    (listp (cdr result))

may help then be it.
 		2010-10-26 07:27:19 +02:00
..
ob-C.el babel:removing calls to ob-process-params, and updating use of results 2010-10-21 13:06:54 +01:00
ob-R.el babel: R: Fix bug in treatment of :file argument 2010-10-21 23:29:43 +01:00
ob-asymptote.el babel:removing calls to ob-process-params, and updating use of results 2010-10-21 13:06:54 +01:00
ob-clojure.el ob-clojure: fixed error message when clojure binary is not found 2010-10-25 11:12:49 -06:00
ob-comint.el Some docstring typos 2010-09-16 20:55:25 +01:00
ob-css.el babel: css: Delete unnecessary language-specific expansion function 2010-10-21 13:06:01 +01:00
ob-ditaa.el babel: ditaa: Delete unnecessary language-specific expansion function 2010-10-21 13:06:01 +01:00
ob-dot.el babel:removing calls to ob-process-params, and updating use of results 2010-10-21 13:06:54 +01:00
ob-emacs-lisp.el babel:removing calls to ob-process-params, and updating use of results 2010-10-21 13:06:54 +01:00
ob-eval.el typos 2010-09-22 22:10:13 +01:00
ob-exp.el unifying ob-process-params and ob-expand-variables 2010-10-21 13:06:01 +01:00
ob-gnuplot.el babel: gnuplot: New variable assignment scheme 2010-10-21 13:06:02 +01:00
ob-haskell.el Don't pass more than two arguments to mapc 2010-10-24 20:51:24 +02:00
ob-js.el babel:removing calls to ob-process-params, and updating use of results 2010-10-21 13:06:54 +01:00
ob-keys.el babel: New function to mark the body of a src block. 2010-10-19 13:19:33 +01:00
ob-latex.el removing obsoleted optional third argument from org-babel-expand-body:LANG 2010-10-21 13:06:00 +01:00
ob-ledger.el babel: Make temp file names consistent 2010-09-22 22:10:13 +01:00
ob-lisp.el babel:removing calls to ob-process-params, and updating use of results 2010-10-21 13:06:54 +01:00
ob-lob.el unifying ob-process-params and ob-expand-variables 2010-10-21 13:06:01 +01:00
ob-matlab.el Mention release 7.01 on the website, push release number to 7.01trans 2010-07-19 08:33:24 +02:00
ob-mscgen.el babel: mscgen: Delete unnecessary language-specific expansion function 2010-10-21 13:06:02 +01:00
ob-ocaml.el babel:removing calls to ob-process-params, and updating use of results 2010-10-21 13:06:54 +01:00
ob-octave.el babel:removing calls to ob-process-params, and updating use of results 2010-10-21 13:06:54 +01:00
ob-org.el suggesting a new function org-export-string 2010-10-22 06:48:32 -06:00
ob-perl.el babel:removing calls to ob-process-params, and updating use of results 2010-10-21 13:06:54 +01:00
ob-plantuml.el babel: plantuml: Delete unnecessary language-specific expansion function 2010-10-21 13:06:02 +01:00
ob-python.el babel:removing calls to ob-process-params, and updating use of results 2010-10-21 13:06:54 +01:00
ob-ref.el ob-ref: don't forget arguments to referenced code blocks 2010-10-21 13:06:55 +01:00
ob-ruby.el babel:removing calls to ob-process-params, and updating use of results 2010-10-21 13:06:54 +01:00
ob-sass.el babel: sass: Use generic expansion function 2010-10-21 13:06:03 +01:00
ob-scheme.el babel:removing calls to ob-process-params, and updating use of results 2010-10-21 13:06:54 +01:00
ob-screen.el babel:removing calls to ob-process-params, and updating use of results 2010-10-21 13:06:54 +01:00
ob-sh.el babel: Handle non-nested list values in shell 2010-10-21 13:06:56 +01:00
ob-sql.el babel:removing calls to ob-process-params, and updating use of results 2010-10-21 13:06:54 +01:00
ob-sqlite.el removing obsoleted optional third argument from org-babel-expand-body:LANG 2010-10-21 13:06:00 +01:00
ob-table.el ob-table: simplified to reflect to var resolution 2010-10-21 13:06:55 +01:00
ob-tangle.el tangle: ensure that full info (with expanded variables) for tangling blocks 2010-10-21 07:00:39 -06:00
ob.el Declare to silence byte compiler 2010-10-24 20:45:26 +02:00
org-agenda.el Sexp diary entries may retrurn a list 2010-10-26 07:27:19 +02:00
org-archive.el Use global archive location default 2010-09-11 07:38:27 +02:00
org-ascii.el ASCII export: swallow {} after entity macro 2010-10-15 09:39:42 +02:00
org-attach.el Mention release 7.01 on the website, push release number to 7.01trans 2010-07-19 08:33:24 +02:00
org-bbdb.el Sexp diary entries may retrurn a list 2010-10-26 07:27:19 +02:00
org-beamer.el Fix typo 2010-10-12 07:26:36 +02:00
org-bibtex.el Mention release 7.01 on the website, push release number to 7.01trans 2010-07-19 08:33:24 +02:00
org-capture.el Fix empty line bug in capture 2010-10-26 06:34:16 +02:00
org-clock.el Fix dangling clocks created by org-clock-out-hook clocking in again 2010-10-03 11:47:15 -04:00
org-colview-xemacs.el Allow "#" and "%" in tags 2010-08-31 08:25:20 +02:00
org-colview.el Allow "#" and "%" in tags 2010-08-31 08:25:20 +02:00
org-compat.el Improve XEmacs compatibility 2010-10-18 14:23:38 +02:00
org-crypt.el Mention release 7.01 on the website, push release number to 7.01trans 2010-07-19 08:33:24 +02:00
org-ctags.el Mention release 7.01 on the website, push release number to 7.01trans 2010-07-19 08:33:24 +02:00
org-datetree.el Mention release 7.01 on the website, push release number to 7.01trans 2010-07-19 08:33:24 +02:00
org-docbook.el Minor fixes 2010-10-26 07:10:48 +02:00
org-docview.el Remove compile-time dependency on doc-view.el 2010-08-29 21:29:16 +02:00
org-entities.el Mention release 7.01 on the website, push release number to 7.01trans 2010-07-19 08:33:24 +02:00
org-exp-blocks.el org-exp-blocks now expands blocks *after* including files 2010-09-07 23:50:27 -06:00
org-exp.el Fix reference to wrong symbol 2010-10-24 20:41:26 +02:00
org-faces.el Mention release 7.01 on the website, push release number to 7.01trans 2010-07-19 08:33:24 +02:00
org-feed.el Fix typo in customization group :tag property 2010-09-15 11:36:17 +02:00
org-footnote.el Defvar to silence byte compiler 2010-10-24 20:43:44 +02:00
org-freemind.el Update freemind converter 2010-10-25 13:27:32 +02:00
org-gnus.el Query article number from file is nil by default 2010-10-11 20:32:23 +02:00
org-habit.el org-habit.el: better error handling required 2010-08-25 12:16:47 +02:00
org-html.el Minor fixes 2010-10-26 07:10:48 +02:00
org-icalendar.el Allow iCalendar to use UTC for exported date-time. 2010-09-14 14:05:31 +02:00
org-id.el Autoload org-id-store-link 2010-07-21 18:37:34 +02:00
org-indent.el lisp/org-indent.el: Fix bug in org-indent that changes the selection 2010-10-21 18:26:31 +02:00
org-info.el Mention release 7.01 on the website, push release number to 7.01trans 2010-07-19 08:33:24 +02:00
org-inlinetask.el typo in variable name: org-inlinetask-defaut-state 2010-10-20 14:06:59 +02:00
org-irc.el Mention release 7.01 on the website, push release number to 7.01trans 2010-07-19 08:33:24 +02:00
org-jsinfo.el Mention release 7.01 on the website, push release number to 7.01trans 2010-07-19 08:33:24 +02:00
org-latex.el HTML export: Improved support for field alignment, including centering 2010-10-22 09:19:39 +02:00
org-list.el Enhance XEmacs compatibility 2010-10-17 18:39:26 +02:00
org-mac-message.el Mention release 7.01 on the website, push release number to 7.01trans 2010-07-19 08:33:24 +02:00
org-macs.el Update freemind converter 2010-10-25 13:27:32 +02:00
org-mew.el Define properties for date header field 2010-09-23 18:33:39 +02:00
org-mhe.el Define properties for date header field 2010-09-23 18:33:39 +02:00
org-mks.el Mention release 7.01 on the website, push release number to 7.01trans 2010-07-19 08:33:24 +02:00
org-mobile.el Fix encrypting agenda 2010-10-14 08:23:34 +02:00
org-mouse.el Replace non-interactive use of `org-next-item' and `org-previous-item'. 2010-09-12 18:53:18 +02:00
org-plot.el Mention release 7.01 on the website, push release number to 7.01trans 2010-07-19 08:33:24 +02:00
org-protocol.el org-protocol default template should be nil 2010-09-02 16:41:53 +02:00
org-publish.el Improve docstring for org-publish-project-alist 2010-10-14 14:12:37 +02:00
org-remember.el Allow %:org-date for Gnus links. 2010-09-22 11:35:32 +02:00
org-rmail.el Define properties for date header field 2010-09-23 18:33:39 +02:00
org-src.el Avoid resolving babel references with C-c ' 2010-10-21 13:06:56 +01:00
org-table.el HTML export: Improved support for field alignment, including centering 2010-10-22 09:19:39 +02:00
org-taskjuggler.el Fix an error in org-taskjuggler-get-unique-id 2010-10-20 14:07:17 +02:00
org-timer.el Require org-clock.el where needed. 2010-09-07 02:28:06 +02:00
org-vm.el Define properties for date header field 2010-09-23 18:33:39 +02:00
org-w3m.el Mention release 7.01 on the website, push release number to 7.01trans 2010-07-19 08:33:24 +02:00
org-wl.el Define properties for date header field 2010-09-23 18:33:39 +02:00
org-xoxo.el Mention release 7.01 on the website, push release number to 7.01trans 2010-07-19 08:33:24 +02:00
org.el Sexp diary entries may retrurn a list 2010-10-26 07:27:19 +02:00