ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode 

Conflicts:
	lisp/ChangeLog
This commit is contained in:
Carsten Dominik 2010-06-08 12:05:52 +02:00
parent e04b71649e a85cb37d47
commit deef19a786
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -3,6 +3,10 @@
* org-exp.el (org-export): Added taskjuggler export to the export * org-exp.el (org-export): Added taskjuggler export to the export
dispatcher. dispatcher.
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> 2010-05-28 Bastien Guerry <bzg@altern.org>
* org-timer.el (org-timer-set-timer): Use a prefix argument. * org-timer.el (org-timer-set-timer): Use a prefix argument.

4
lisp/org-timer.el
View File

@ -320,10 +320,10 @@ prompt the use if she wants to replace it.
Called with a numeric prefix argument, use this numeric value as Called with a numeric prefix argument, use this numeric value as
the duration of the timer. 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. 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 without prompting the user for a duration and automatically
replace any running timer." replace any running timer."
(interactive "P") (interactive "P")