Merge branch 'maint'
This commit is contained in:
commit
0de3f78c28
10
lisp/org.el
10
lisp/org.el
|
@ -15995,10 +15995,18 @@ non-nil."
|
||||||
|
|
||||||
(defun org-time-stamp-inactive (&optional arg)
|
(defun org-time-stamp-inactive (&optional arg)
|
||||||
"Insert an inactive time stamp.
|
"Insert an inactive time stamp.
|
||||||
|
|
||||||
An inactive time stamp is enclosed in square brackets instead of angle
|
An inactive time stamp is enclosed in square brackets instead of angle
|
||||||
brackets. It is inactive in the sense that it does not trigger agenda entries,
|
brackets. It is inactive in the sense that it does not trigger agenda entries,
|
||||||
does not link to the calendar and cannot be changed with the S-cursor keys.
|
does not link to the calendar and cannot be changed with the S-cursor keys.
|
||||||
So these are more for recording a certain time/date."
|
So these are more for recording a certain time/date.
|
||||||
|
|
||||||
|
If the user specifies a time like HH:MM or if this command is called with
|
||||||
|
at least one prefix argument, the time stamp contains the date and the time.
|
||||||
|
Otherwise, only the date is included.
|
||||||
|
|
||||||
|
When called with two universal prefix arguments, insert an active time stamp
|
||||||
|
with the current time without prompting the user."
|
||||||
(interactive "P")
|
(interactive "P")
|
||||||
(org-time-stamp arg 'inactive))
|
(org-time-stamp arg 'inactive))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue