diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2019-07-30 13:11:38 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2019-07-30 13:11:38 +0200 |
| commit | 74c5d688bb29c34c7392267840102f006465dd02 (patch) | |
| tree | 1c8937b387e12f14013866539e904030de3fac27 /lisp/vc/ediff-mult.el | |
| parent | 4134e6f87c955d89d6baff07fa15f25b19db99cf (diff) | |
| download | emacs-74c5d688bb29c34c7392267840102f006465dd02.tar.gz emacs-74c5d688bb29c34c7392267840102f006465dd02.tar.bz2 emacs-74c5d688bb29c34c7392267840102f006465dd02.zip | |
Use decoded time accessors in ediff-mult
* lisp/vc/ediff-mult.el (ediff-format-date): Use decoded time
accessors.
Diffstat (limited to 'lisp/vc/ediff-mult.el')
| -rw-r--r-- | lisp/vc/ediff-mult.el | 13 |
1 files changed, 6 insertions, 7 deletions
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) |