From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephan Schmitt Subject: [PATCH 1/2] respect startgroup/endgroup delimiters with description in org-tag-alist Date: Thu, 5 Nov 2009 10:57:34 +0100 Message-ID: <1257415055-8120-1-git-send-email-drmabuse@cs.tu-berlin.de> Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N5z75-0000SF-AC for emacs-orgmode@gnu.org; Thu, 05 Nov 2009 04:58:43 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N5z70-0000RS-JD for emacs-orgmode@gnu.org; Thu, 05 Nov 2009 04:58:42 -0500 Received: from [199.232.76.173] (port=42710 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N5z70-0000RP-GF for emacs-orgmode@gnu.org; Thu, 05 Nov 2009 04:58:38 -0500 Received: from algieba.ni.cs.tu-berlin.de ([130.149.24.75]:53021) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N5z70-0003Iv-0v for emacs-orgmode@gnu.org; Thu, 05 Nov 2009 04:58:38 -0500 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 org-agenda-filter-by-tag and org-get-current-options didn't account for radio group delimiters in org-tag-alist where a description is attached as second item of the list: ((:startgroup "context") ("Work" . 87) ("Home" . 72) ("Errand" . 69) (:endgroup) (:newline) (:startgroup "communication") ("Mail" . 77) ("Call" . 67) (:endgroup) (:newline) ...) --- lisp/org-agenda.el | 5 ++++- lisp/org-exp.el | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 5e0f4fd..6e90f6f 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -5094,7 +5094,10 @@ to switch to narrowing." (interactive "P") (let* ((alist org-tag-alist-for-agenda) (tag-chars (mapconcat - (lambda (x) (if (cdr x) (char-to-string (cdr x)) "")) + (lambda (x) (if (and (not (symbolp (car x))) + (cdr x)) + (char-to-string (cdr x)) + "")) alist "")) (efforts (org-split-string (or (cdr (assoc (concat org-effort-property "_ALL") diff --git a/lisp/org-exp.el b/lisp/org-exp.el index a71f081..cef29b7 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -2750,8 +2750,9 @@ Does include HTML export options as well as TODO and CATEGORY stuff." ((not org-log-done) "nologdone")) (or (mapconcat (lambda (x) (cond - ((equal '(:startgroup) x) "{") - ((equal '(:endgroup) x) "}") + ((equal :startgroup (car x)) "{") + ((equal :endgroup (car x)) "}") + ((equal :newline (car x)) "") ((cdr x) (format "%s(%c)" (car x) (cdr x))) (t (car x)))) (or org-tag-alist (org-get-buffer-tags)) " ") "") -- 1.6.4.4