* textmodes/org.el (org-fix-decoded-time): New function.

	(org-display-custom-time): Use `org-fix-decoded-time'.

diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index 30e72ebfe4b294672db5a2b2b2d80fa11a5a2dc8..30326066504ca43de14626eebe5cd38055e64472 100644 (file)
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -6112,6 +6112,7 @@ The command returns the inserted time stamp."
         (with-hm (and (nth 1 t1) (nth 2 t1)))
         (inactive (= (char-before (1- beg)) ?\[))
         (tf (funcall (if with-hm 'cdr 'car) org-time-stamp-custom-formats))
+        (time (org-fix-decoded-time t1))
         (time (mapcar (lambda (x) (or x 0)) t1))
         (str (org-add-props
                  (format-time-string
@@ -6127,6 +6128,12 @@ The command returns the inserted time stamp."
          (put-text-property beg end 'end-glyph (make-glyph str)))
       (put-text-property beg end 'display str))))
 
+(defun org-fix-decoded-time (time)
+  "Set 0 instead of nil for the first 6 elements of time.
+Don't touch the rest."
+  (let ((n 0))
+    (mapcar (lambda (x) (if (< (setq n (1+ n)) 7) (or x 0) x)) time)))
+
 (defun org-days-to-time (timestamp-string)
   "Difference between TIMESTAMP-STRING and now in days."
   (- (time-to-days (org-time-string-to-time timestamp-string))