summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2010-06-08 09:35:07 +0200
committerBastien Guerry <bzg@altern.org>2010-06-08 09:35:07 +0200
commita85cb37d47f525bf3f40cda8813f32e2257011d5 (patch)
tree1a44336c6925bc3c57f21c9ae4fb82f6ce23a5ac
parentcdc70ed68d05730b0f5689713acf4bff20c22898 (diff)
downloadorg-mode-a85cb37d47f525bf3f40cda8813f32e2257011d5.tar.gz
* org-timer.el (org-timer-set-timer): Fix typo in the docstring.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/org-timer.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ba1b9e..3034f56 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-08 Bastien Guerry <bzg@altern.org>
+
+ * org-timer.el (org-timer-set-timer): Fix typo in the docstring.
+
2010-05-28 Bastien Guerry <bzg@altern.org>
* org-timer.el (org-timer-set-timer): Use a prefix argument.
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 88ae69a..e0817c8 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -320,10 +320,10 @@ prompt the use if she wants to replace it.
Called with a numeric prefix argument, use this numeric value as
the duration of the timer.
-Called with a `C-u' prefix argument, use `org-timer-default-timer'
+Called with a `C-u' prefix arguments, use `org-timer-default-timer'
without prompting the user for a duration.
-With two `C-u' prefix argument, use `org-timer-default-timer'
+With two `C-u' prefix arguments, use `org-timer-default-timer'
without prompting the user for a duration and automatically
replace any running timer."
(interactive "P")