summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-08-02 11:59:27 +0200
committerBastien Guerry <bzg@altern.org>2012-08-02 11:59:27 +0200
commitaa490ffa04f21a03ec4e52a586500b41a0e90d33 (patch)
tree77be308af3860a605f7bdc833a1e4028c2202eaf
parent96d4c5ef0ae4fc7d1db90bf714c2ec03eefa90dc (diff)
downloadorg-mode-aa490ffa04f21a03ec4e52a586500b41a0e90d33.tar.gz
Small doc fix.
* org.texi (Fast access to TODO states): Fix documentation about allowed characters for fast todo selection. * org.el (org-todo-keywords): Ditto. This fixes this wrong change here: http://orgmode.org/w/?p=org-mode.git;a=commit;h=b6cb72
-rw-r--r--doc/org.texi6
-rw-r--r--lisp/org.el4
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/org.texi b/doc/org.texi
index 8a64da5..1a1e383 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -3925,9 +3925,9 @@ from @code{DONE} to @code{REPORT} in the example above. See also
If you would like to quickly change an entry to an arbitrary TODO state
instead of cycling through the states, you can set up keys for single-letter
-access to the states. This is done by adding the selection
-letter@footnote{Only alphabetical letters are allowed for fast TODO selection
-keys.} after each keyword, in parentheses. For example:
+access to the states. This is done by adding the selection character after
+each keyword, in parentheses@footnote{All characters are allowed except
+@code{@@^!}, which have a special meaning here.}. For example:
@lisp
(setq org-todo-keywords
diff --git a/lisp/org.el b/lisp/org.el
index 8e0f987..5f0f14e 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -2105,11 +2105,11 @@ cycling, see the manual.
TODO keywords and interpretation can also be set on a per-file basis with
the special #+SEQ_TODO and #+TYP_TODO lines.
-Each keyword can optionally specify a letter for fast state selection
+Each keyword can optionally specify a character for fast state selection
\(in combination with the variable `org-use-fast-todo-selection')
and specifiers for state change logging, using the same syntax that
is used in the \"#+TODO:\" lines. For example, \"WAIT(w)\" says that
-the WAIT state can be selected with the \"w\" letter. \"WAIT(w!)\"
+the WAIT state can be selected with the \"w\" key. \"WAIT(w!)\"
indicates to record a time stamp each time this state is selected.
Each keyword may also specify if a timestamp or a note should be