Minor fixes to org-capture.el

lisp/org-capture.el

@@ -78,8 +78,9 @@ keys         The keys that will select the template, as a string, characters
 
                      (\"b\" \"Templates for marking stuff to buy\")
 
-             Do not use \"C\" as a key, it is reserved for customizing the
-             template variable.
+             The \"C\" key is used by default for quick access to the
+             customization of the template variable.  But if you want to use
+             that key for a template, you can.
 
 description  A short string describing the template, will be shown during
              selection.
@@ -801,7 +802,7 @@ Point will remain at the first line after the inserted text."
        ((eq type 'item) (setq txt "- %?"))
        ((eq type 'checkitem) (setq txt "- [ ] %?"))
        ((eq type 'table-line) (setq txt "| %? |"))
-       ((member type '(nil entry)) (setq txt "* %?"))))
+       ((member type '(nil entry)) (setq txt "* %?\n  %a"))))
     (org-capture-put :template txt :type type)))
 
 (defun org-capture-goto-target (&optional template-key)

lisp/org-mks.el

@@ -100,7 +100,10 @@ also (\"key\" \"description\") entries.  When they are selected,
 	    (message prompt)
 	    (setq pressed (char-to-string (read-char-exclusive))))
 	  (if (equal pressed "\C-g") (error "Abort"))
-	  (if (assoc pressed specials) (throw 'exit (setq rtn pressed)))
+	  (when (and (not (assoc pressed table))
+		     (not (member pressed des-keys))
+		     (assoc pressed specials))
+	    (throw 'exit (setq rtn pressed)))
 	  (unless (member pressed des-keys)
 	    (throw 'exit (setq rtn (rassoc (cdr (assoc pressed table))
 					   orig-table))))