diff options
| author | Lars Ingebrigtsen | 2019-07-30 13:11:38 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-07-30 13:11:38 +0200 |
| commit | 74c5d688bb29c34c7392267840102f006465dd02 (patch) | |
| tree | 1c8937b387e12f14013866539e904030de3fac27 | |
| parent | 4134e6f87c955d89d6baff07fa15f25b19db99cf (diff) | |
| download | emacs-74c5d688bb29c34c7392267840102f006465dd02.tar.gz emacs-74c5d688bb29c34c7392267840102f006465dd02.zip | |
Use decoded time accessors in ediff-mult
* lisp/vc/ediff-mult.el (ediff-format-date): Use decoded time
accessors.
| -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." | |||
| 1205 | ;; TIME is like the output of decode-time | 1205 | ;; TIME is like the output of decode-time |
| 1206 | (defun ediff-format-date (time) | 1206 | (defun ediff-format-date (time) |
| 1207 | (format "%s %2d %4d %s:%s:%s" | 1207 | (format "%s %2d %4d %s:%s:%s" |
| 1208 | (cdr (assoc (nth 4 time) ediff-months)) ; month | 1208 | (cdr (assoc (decoded-time-month time) ediff-months)) |
| 1209 | (nth 3 time) ; day | 1209 | (decoded-time-day time) |
| 1210 | (nth 5 time) ; year | 1210 | (decoded-time-year time) |
| 1211 | (ediff-fill-leading-zero (nth 2 time)) ; hour | 1211 | (ediff-fill-leading-zero (decoded-time-hour time)) |
| 1212 | (ediff-fill-leading-zero (nth 1 time)) ; min | 1212 | (ediff-fill-leading-zero (decoded-time-minute time)) |
| 1213 | (ediff-fill-leading-zero (nth 0 time)) ; sec | 1213 | (ediff-fill-leading-zero (decoded-time-second time)))) |
| 1214 | )) | ||
| 1215 | 1214 | ||
| 1216 | ;; Draw the directories | 1215 | ;; Draw the directories |
| 1217 | (defun ediff-insert-dirs-in-meta-buffer (meta-list) | 1216 | (defun ediff-insert-dirs-in-meta-buffer (meta-list) |