From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Danjou Subject: [PATCH 3/3] org-agenda: allow %() in prefix format Date: Fri, 17 Dec 2010 18:18:15 +0100 Message-ID: <1292606295-18457-3-git-send-email-julien@danjou.info> References: <1292606295-18457-1-git-send-email-julien@danjou.info> Return-path: Received: from [140.186.70.92] (port=58569 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PTdwr-0006nv-JM for emacs-orgmode@gnu.org; Fri, 17 Dec 2010 12:18:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PTdwh-00049Q-8G for emacs-orgmode@gnu.org; Fri, 17 Dec 2010 12:18:29 -0500 Received: from coquelicot-s.easter-eggs.com ([213.215.37.94]:49512) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PTdwh-00048S-2i for emacs-orgmode@gnu.org; Fri, 17 Dec 2010 12:18:19 -0500 In-Reply-To: <1292606295-18457-1-git-send-email-julien@danjou.info> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Cc: Julien Danjou * org-agenda.el (org-compile-prefix-format): Allow %() expression. Signed-off-by: Julien Danjou --- lisp/org-agenda.el | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index a23d7d7..e0b54b8 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -1316,6 +1316,8 @@ This format works similar to a printf format, with the following meaning: %t the time-of-day specification if one applies to the entry, in the format HH:MM %s Scheduling/Deadline information, a short string + %(expression) Eval expression and replaces the control string + by the result All specifiers work basically like the standard `%s' of printf, but may contain two additional characters: A question mark just after the `%' and @@ -5389,11 +5391,12 @@ The resulting form is returned and stored in the variable (t " %-12:c%?-12t% s"))) (start 0) varform vars var e c f opt) - (while (string-match "%\\(\\?\\)?\\([-+]?[0-9.]*\\)\\([ .;,:!?=|/<>]?\\)\\([ctsei]\\)" + (while (string-match "%\\(\\?\\)?\\([-+]?[0-9.]*\\)\\([ .;,:!?=|/<>]?\\)\\([ctsei]\\|(.+)\\)" s start) - (setq var (cdr (assoc (match-string 4 s) - '(("c" . category) ("t" . time) ("s" . extra) - ("i" . category-icon) ("T" . tag) ("e" . effort)))) + (setq var (or (cdr (assoc (match-string 4 s) + '(("c" . category) ("t" . time) ("s" . extra) + ("i" . category-icon) ("T" . tag) ("e" . effort)))) + 'eval) c (or (match-string 3 s) "") opt (match-beginning 1) start (1+ (match-beginning 0))) @@ -5409,12 +5412,14 @@ The resulting form is returned and stored in the variable (save-match-data (if (string-match "\\.[0-9]+" x) (string-to-number (substring (match-string 0 x) 1))))))) - (if opt - (setq varform - `(if (equal "" ,var) - "" - (format ,f (if (equal "" ,var) "" (concat ,var ,c))))) - (setq varform `(format ,f (if (equal ,var "") "" (concat ,var ,c (get-text-property 0 'extra-space ,var)))))) + (if (eq var 'eval) + (setq varform `(format ,f (org-eval ,(read (match-string 4 s))))) + (if opt + (setq varform + `(if (equal "" ,var) + "" + (format ,f (if (equal "" ,var) "" (concat ,var ,c))))) + (setq varform `(format ,f (if (equal ,var "") "" (concat ,var ,c (get-text-property 0 'extra-space ,var))))))) (setq s (replace-match "%s" t nil s)) (push varform vars)) (setq vars (nreverse vars)) -- 1.7.2.3