forked from mirrors/org-mode
Merge branch 'km/from-emacs-master'
This commit is contained in:
commit
f5392c4f2b
|
@ -442,7 +442,7 @@ negates this setting for the duration of the command."
|
||||||
:safe (lambda (val) (or (booleanp val) (integerp val))))
|
:safe (lambda (val) (or (booleanp val) (integerp val))))
|
||||||
|
|
||||||
(defcustom org-link-email-description-format "Email %c: %s"
|
(defcustom org-link-email-description-format "Email %c: %s"
|
||||||
"Format of the description part of a link to an email or usenet message.
|
"Format of the description part of a link to an email or Usenet message.
|
||||||
The following %-escapes will be replaced by corresponding information:
|
The following %-escapes will be replaced by corresponding information:
|
||||||
|
|
||||||
%F full \"From\" field
|
%F full \"From\" field
|
||||||
|
|
|
@ -400,16 +400,16 @@ prompt the user 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 in minutes.
|
the duration of the timer in minutes.
|
||||||
|
|
||||||
Called with a `C-u' prefix arguments, use `org-timer-default-timer'
|
Called with a \\[universal-argument] 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 arguments, use `org-timer-default-timer'
|
With two \\[universal-argument] 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.
|
||||||
|
|
||||||
By default, the timer duration will be set to the number of
|
By default, the timer duration will be set to the number of
|
||||||
minutes in the Effort property, if any. You can ignore this by
|
minutes in the Effort property, if any. You can ignore this by
|
||||||
using three `C-u' prefix arguments."
|
using three \\[universal-argument] prefix arguments."
|
||||||
(interactive "P")
|
(interactive "P")
|
||||||
(when (and org-timer-start-time
|
(when (and org-timer-start-time
|
||||||
(not org-timer-countdown-timer))
|
(not org-timer-countdown-timer))
|
||||||
|
|
|
@ -299,7 +299,7 @@ and its CDR is a list of export options.")
|
||||||
|
|
||||||
(defvar org-export-dispatch-last-position (make-marker)
|
(defvar org-export-dispatch-last-position (make-marker)
|
||||||
"The position where the last export command was created using the dispatcher.
|
"The position where the last export command was created using the dispatcher.
|
||||||
This marker will be used with `C-u C-c C-e' to make sure export repetition
|
This marker will be used with `\\[universal-argument] C-c C-e' to make sure export repetition
|
||||||
uses the same subtree if the previous command was restricted to a subtree.")
|
uses the same subtree if the previous command was restricted to a subtree.")
|
||||||
|
|
||||||
;; For compatibility with Org < 8
|
;; For compatibility with Org < 8
|
||||||
|
|
Loading…
Reference in New Issue