From: Lars Ingebrigtsen Date: Tue, 30 Jul 2019 11:11:38 +0000 (+0200) Subject: Use decoded time accessors in ediff-mult X-Git-Tag: emacs-27.0.90~1817^2~13 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=74c5d688bb29c34c7392267840102f006465dd02;p=emacs.git Use decoded time accessors in ediff-mult * lisp/vc/ediff-mult.el (ediff-format-date): Use decoded time accessors. --- diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el index b6669003352..1bdaca268e5 100644 --- a/lisp/vc/ediff-mult.el +++ b/lisp/vc/ediff-mult.el @@ -1205,13 +1205,12 @@ behavior." ;; TIME is like the output of decode-time (defun ediff-format-date (time) (format "%s %2d %4d %s:%s:%s" - (cdr (assoc (nth 4 time) ediff-months)) ; month - (nth 3 time) ; day - (nth 5 time) ; year - (ediff-fill-leading-zero (nth 2 time)) ; hour - (ediff-fill-leading-zero (nth 1 time)) ; min - (ediff-fill-leading-zero (nth 0 time)) ; sec - )) + (cdr (assoc (decoded-time-month time) ediff-months)) + (decoded-time-day time) + (decoded-time-year time) + (ediff-fill-leading-zero (decoded-time-hour time)) + (ediff-fill-leading-zero (decoded-time-minute time)) + (ediff-fill-leading-zero (decoded-time-second time)))) ;; Draw the directories (defun ediff-insert-dirs-in-meta-buffer (meta-list)