summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2018-03-18 21:27:19 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2018-03-18 21:27:19 +0100
commit0de3f78c28827bb84e7a4fad637694cbcbe0a317 (patch)
tree2051154035fb722a9144532620ee43eb9427722a
parent5e51c92fced32f27174e128f6d19c337bae42dd1 (diff)
parente1f1acbbfb07ca49f857672a1f0648052753568f (diff)
downloadorg-mode-0de3f78c28827bb84e7a4fad637694cbcbe0a317.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el10
1 files changed, 9 insertions, 1 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 3d64fb1..73ab32a 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -15995,10 +15995,18 @@ non-nil."
(defun org-time-stamp-inactive (&optional arg)
"Insert an inactive time stamp.
+
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,
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")
(org-time-stamp arg 'inactive))