=== modified file 'org.el'
--- org.el	2007-10-10 09:37:27 +0000
+++ org.el	2007-10-10 10:05:28 +0000
@@ -1411,11 +1411,14 @@
 (defcustom org-remember-templates nil
   "Templates for the creation of remember buffers.
 When nil, just let remember make the buffer.
-When not nil, this is a list of 4-element lists.  In each entry, the first
+When not nil, this is a list of 5-element lists.  In each entry, the first
 element is a character, a unique key to select this template.
-The second element is the template.  The third element is optional and can
+The second element is a string that will appear when you are prompted to
+select which template to use, so it's easier to choose one when you have 
+more than a couple of them.
+The third element is the template.  The fourth element is optional and can
 specify a destination file for remember items created with this template.
-The default file is given by `org-default-notes-file'.  An optional forth
+The default file is given by `org-default-notes-file'.  An optional fifth
 element can specify the headline in that file that should be offered
 first when the user is asked to file the entry.  The default headline is
 given in the variable `org-remember-default-headline'.
@@ -12445,10 +12448,10 @@
 			(t
 			 (message "Select template: %s"
 				  (mapconcat
-				   (lambda (x) (char-to-string (car x)))
+				   (lambda (x) (format "%s (%s)" (cadr x) (char-to-string (car x))))
 				   org-remember-templates " "))
 			 (read-char-exclusive)))))
-	     (entry (cdr (assoc char org-remember-templates)))
+	     (entry (cddr (assoc char org-remember-templates)))
 	     (tpl (car entry))
 	     (plist-p (if org-store-link-plist t nil))
 	     (file (if (and (nth 1 entry) (stringp (nth 1 entry))