From 781eb9379f9f65f1c1d96abc257f069e2897924a Mon Sep 17 00:00:00 2001
From: James TD Smith <ahktenzero@mohorovi.cc>
Date: Tue, 20 Oct 2009 03:51:29 +0100
Subject: [PATCH] Add a way to display names for tag groups in fast tag
 selection.

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 86fa14fbe..ae6d8e0fa 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -123,6 +123,12 @@
 	(org-mobile-create-index-file): Sort the files to be listed in
 	index.org.
 
+2009-10-17  James TD Smith  <ahktenzero@mohorovi.cc>
+
+	* 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  <carsten.dominik@gmail.com>
 
 	* org-clock.el (org-clock-resolve, org-resolve-clocks)
diff --git a/lisp/org.el b/lisp/org.el
index 5b093fb09..186a2c475 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -11546,15 +11546,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)
@@ -11599,8 +11599,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