summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2013-08-10 08:13:32 (GMT)
committer Nicolas Goaziou <n.goaziou@gmail.com>2013-08-10 08:13:32 (GMT)
commit2a28def0ae480f1dec3fa44f6cd87d1c31bec1af (patch)
tree6e3cb81cbc22587d165fe112f14685597f61637c
parent73b060b768c53dcc25e9bbe983155555dc467060 (diff)
parent13cb28a227275d8d54193267159d6fa5e88650ab (diff)
downloadorg-mode-2a28def0ae480f1dec3fa44f6cd87d1c31bec1af.zip
org-mode-2a28def0ae480f1dec3fa44f6cd87d1c31bec1af.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org.el b/lisp/org.el
index b1a2fa8..e13c2b8 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -16077,7 +16077,7 @@ with the current time without prompting the user."
(setq dh (- h2 h1) dm (- m2 m1))
(if (< dm 0) (setq dm (+ dm 60) dh (1- dh)))
(concat t1 "+" (number-to-string dh)
- (if (/= 0 dm) (concat ":" (number-to-string dm))))))))
+ (and (/= 0 dm) (format ":%02d" dm)))))))
(defun org-time-stamp-inactive (&optional arg)
"Insert an inactive time stamp.