From mboxrd@z Thu Jan 1 00:00:00 1970 From: James TD Smith Subject: [PATCH 2/3] Add a way to display names for tag groups in fast tag selection. Date: Tue, 20 Oct 2009 03:51:29 +0100 Message-ID: <1256007090-32050-3-git-send-email-ahktenzero@mohorovi.cc> References: <1256007090-32050-1-git-send-email-ahktenzero@mohorovi.cc> <1256007090-32050-2-git-send-email-ahktenzero@mohorovi.cc> Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N04p8-00068T-F1 for emacs-orgmode@gnu.org; Mon, 19 Oct 2009 22:51:46 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N04p5-00067E-3F for emacs-orgmode@gnu.org; Mon, 19 Oct 2009 22:51:46 -0400 Received: from [199.232.76.173] (port=34370 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N04p4-00066v-Cw for emacs-orgmode@gnu.org; Mon, 19 Oct 2009 22:51:42 -0400 Received: from 81-86-40-42.dsl.pipex.com ([81.86.40.42]:56689 helo=yog-sothoth.mohorovi.cc) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1N04p3-00088U-Bv for emacs-orgmode@gnu.org; Mon, 19 Oct 2009 22:51:42 -0400 In-Reply-To: <1256007090-32050-2-git-send-email-ahktenzero@mohorovi.cc> 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 If the nil term in the start or end group cells are replaced by strings, these are displayed before or after the brackets for the group. --- lisp/ChangeLog | 6 ++++++ lisp/org.el | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 47b44cd..83af7a4 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -29,6 +29,12 @@ (org-mobile-create-index-file): Sort the files to be listed in index.org. +2009-10-17 James TD Smith + + * org.el (org-fast-tag-selection): Add a way to display a + description for a tag group. This is done by adding a string to + either the startgroup or endgroup cell. + 2009-10-17 Carsten Dominik * org-clock.el (org-clock-resolve, org-resolve-clocks) diff --git a/lisp/org.el b/lisp/org.el index a394443..3f8bbee 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -11542,15 +11542,15 @@ Returns the new tags string, or nil to not change the current settings." (setq tbl fulltable char ?a cnt 0) (while (setq e (pop tbl)) (cond - ((equal e '(:startgroup)) + ((equal (car e) :startgroup) (push '() groups) (setq ingroup t) (when (not (= cnt 0)) (setq cnt 0) (insert "\n")) - (insert "{ ")) - ((equal e '(:endgroup)) + (insert (if (cdr e) (format "%s: " (cdr e)) "") "{ ")) + ((equal (car e) :endgroup) (setq ingroup nil cnt 0) - (insert "}\n")) + (insert "}" (if (cdr e) (format " (%s) " (cdr e)) "") "\n")) ((equal e '(:newline)) (when (not (= cnt 0)) (setq cnt 0) @@ -11595,8 +11595,8 @@ Returns the new tags string, or nil to not change the current settings." (setq rtn (catch 'exit (while t - (message "[a-z..]:Toggle [SPC]:clear [RET]:accept [TAB]:free%s%s" - (if groups " [!] no groups" " [!]groups") + (message "[a-z..]:Toggle [SPC]:clear [RET]:accept [TAB]:free [!] %sgroups%s" + (if (not groups) "no " "") (if expert " [C-c]:window" (if exit-after-next " [C-c]:single" " [C-c]:multi"))) (setq c (let ((inhibit-quit t)) (read-char-exclusive))) (cond -- 1.6.3.3