diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2015-02-19 10:33:26 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2015-02-19 10:33:26 +0100 |
commit | 38ab8b2af360085370eee5342e20827a3fb976e3 (patch) | |
tree | 80f18cfdd8d2712156ba5032e62469cb460cc3d5 | |
parent | 7745ef04c9d8ac17009abae1b0e25649a472723b (diff) | |
download | org-mode-38ab8b2af360085370eee5342e20827a3fb976e3.tar.gz |
Fix `org-time-stamp'
* lisp/org.el (org-time-stamp): Properly insert time when specified.
This fixes e50baa4cf7b97cc2e9b6991560be2bd970106e1e.
Reported-by: Rasmus <rasmus@gmx.us>
<http://permalink.gmane.org/gmane.emacs.orgmode/95210>
-rwxr-xr-x | lisp/org.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el index 4f047b2..3107e70 100755 --- a/lisp/org.el +++ b/lisp/org.el @@ -16484,6 +16484,8 @@ non-nil." (repeater (and ts (string-match "\\([.+-]+[0-9]+[hdwmy] ?\\)+" ts) (match-string 0 ts))) + org-time-was-given + org-end-time-was-given (time (and (if (equal arg '(16)) (current-time) ;; Preserve `this-command' and `last-command'. @@ -16491,8 +16493,7 @@ non-nil." (last-command last-command)) (org-read-date arg 'totime nil nil default-time default-input - inactive))))) - org-time-was-given org-end-time-was-given) + inactive)))))) (cond ((and ts (memq last-command '(org-time-stamp org-time-stamp-inactive)) |