diff options
author | Bastien Guerry <bzg@altern.org> | 2013-01-12 09:20:22 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2013-01-12 09:20:22 +0100 |
commit | 09f108ec576f6c7a7a33d0a3cdec9478ad1c9627 (patch) | |
tree | ed6df12610c60eb5b50188e0d66112be6653e8f4 | |
parent | 0499f0a939ce360b96bd45ab88a8505e4f8ab71d (diff) | |
parent | a0ad34b8d432b513d476f44e5da5ae31f9039516 (diff) | |
download | org-mode-09f108ec576f6c7a7a33d0a3cdec9478ad1c9627.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-agenda.el | 4 | ||||
-rw-r--r-- | lisp/org-capture.el | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index fb4fa28..27abc58 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -2415,7 +2415,7 @@ For example, if you have a custom agenda command \"p\" and you want this command to be accessible only from plain text files, use this: - '((\"p\" (in-file . \"\\.txt\"))) + '((\"p\" ((in-file . \"\\.txt\")))) Here are the available contexts definitions: @@ -2431,7 +2431,7 @@ accessible if there is at least one valid check. You can also bind a key to another agenda custom command depending on contextual rules. - '((\"p\" \"q\" (in-file . \"\\.txt\"))) + '((\"p\" \"q\" ((in-file . \"\\.txt\")))) Here it means: in .txt files, use \"p\" as the key for the agenda command otherwise associated with \"q\". (The command diff --git a/lisp/org-capture.el b/lisp/org-capture.el index 92a1707..639a490 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -453,7 +453,7 @@ For example, if you have a capture template \"c\" and you want this template to be accessible only from `message-mode' buffers, use this: - '((\"c\" (in-mode . \"message-mode\"))) + '((\"c\" ((in-mode . \"message-mode\")))) Here are the available contexts definitions: @@ -469,11 +469,11 @@ accessible if there is at least one valid check. You can also bind a key to another agenda custom command depending on contextual rules. - '((\"c\" \"d\" (in-mode . \"message-mode\"))) + '((\"c\" \"d\" ((in-mode . \"message-mode\")))) -Here it means: in `message-mode buffers', use \"d\" as the +Here it means: in `message-mode buffers', use \"c\" as the key for the capture template otherwise associated with \"d\". -\(The template originally associated with \"q\" is not displayed +\(The template originally associated with \"d\" is not displayed to avoid duplicates.)" :version "24.3" :group 'org-capture |