aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/eshell/em-ls.el14
1 files changed, 8 insertions, 6 deletions
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index 89969d32582..b1aab79538f 100644
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -525,12 +525,14 @@ whose cdr is the list of file attributes."
525 " " (format-time-string 525 " " (format-time-string
526 (concat 526 (concat
527 eshell-ls-date-format " " 527 eshell-ls-date-format " "
528 (if (= (nth 5 (decode-time)) 528 (if (= (decoded-time-year (decode-time))
529 (nth 5 (decode-time 529 (decoded-time-year
530 (nth (cond 530 (decode-time
531 ((eq sort-method 'by-atime) 4) 531 (nth (cond
532 ((eq sort-method 'by-ctime) 6) 532 ((eq sort-method 'by-atime) 4)
533 (t 5)) attrs)))) 533 ((eq sort-method 'by-ctime) 6)
534 (t 5))
535 attrs))))
534 "%H:%M" 536 "%H:%M"
535 " %Y")) (nth (cond 537 " %Y")) (nth (cond
536 ((eq sort-method 'by-atime) 4) 538 ((eq sort-method 'by-atime) 4)