procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove some compat code in esh-util

Browse source 
* lisp/eshell/esh-util.el (eshell-parse-ange-ls): Remove
older-Emacs compat code.
This commit is contained in:
Lars Ingebrigtsen 2019-08-01 13:38:41 +02:00
parent 3c31775527
commit 5bccff7b5b
1 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lisp/eshell/esh-util.el
View file

@ -600,10 +600,7 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.
(setq host-users (cdr host-users))
(cdr (assoc user host-users))))))
;; Add an autoload for parse-time-string
(if (and (not (fboundp 'parse-time-string))
(locate-library "parse-time"))
(autoload 'parse-time-string "parse-time"))
(autoload 'parse-time-string "parse-time")
(eval-when-compile
(require 'ange-ftp nil t)) ; ange-ftp-parse-filename
@ -649,17 +646,14 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.
(size (string-to-number (match-string 5)))
(name (ange-ftp-parse-filename))
(mtime
(if (fboundp 'parse-time-string)
(let ((moment (parse-time-string
(match-string 6))))
(if (nth 0 moment)
(setcar (nthcdr 5 moment)
(decoded-time-year (decode-time)))
(setcar (nthcdr 0 moment) 0)
(setcar (nthcdr 1 moment) 0)
(setcar (nthcdr 2 moment) 0))
(encode-time moment))
(ange-ftp-file-modtime (expand-file-name name dir))))
(let ((moment (parse-time-string (match-string 6))))
(if (nth 0 moment)
(setcar (nthcdr 5 moment)
(decoded-time-year (decode-time)))
(setcar (nthcdr 0 moment) 0)
(setcar (nthcdr 1 moment) 0)
(setcar (nthcdr 2 moment) 0))
(encode-time moment)))
symlink)
(if (string-match "\\(.+\\) -> \\(.+\\)" name)
(setq symlink (match-string 2 name)