diff options
| author | Carsten Dominik <carsten.dominik@gmail.com> | 2010-06-23 06:24:26 +0200 |
|---|---|---|
| committer | Carsten Dominik <carsten.dominik@gmail.com> | 2010-06-23 06:24:26 +0200 |
| commit | 2ea8652235dbb161400ce59439d29efbe9c929bd (patch) | |
| tree | a140687f06b4b57f78d8b0fa538e36195ad1e7b5 | |
| parent | 80bcadf605c3adba2fc83e0b53da7bd9551c4f4a (diff) | |
| download | org-mode-2ea8652235dbb161400ce59439d29efbe9c929bd.tar.gz | |
Minor fixes to org-capture.el
| -rw-r--r-- | lisp/org-capture.el | 7 | ||||
| -rw-r--r-- | lisp/org-mks.el | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/org-capture.el b/lisp/org-capture.el index 32db517..a39759b 100644 --- a/lisp/org-capture.el +++ b/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) diff --git a/lisp/org-mks.el b/lisp/org-mks.el index b0b102d..59f6527 100644 --- a/lisp/org-mks.el +++ b/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)))) |