diff options
| author | Lars Ingebrigtsen | 2019-08-01 13:38:41 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-08-01 13:48:29 +0200 |
| commit | 5bccff7b5ba3529de29e12de151eb4bfb5859e08 (patch) | |
| tree | 63674b0f0ad1e25145cc63f3505fd919af1f2db4 /lisp/eshell | |
| parent | 3c31775527acbd3c4fdf47d01b8db28e7d78ecd3 (diff) | |
| download | emacs-5bccff7b5ba3529de29e12de151eb4bfb5859e08.tar.gz emacs-5bccff7b5ba3529de29e12de151eb4bfb5859e08.zip | |
Remove some compat code in esh-util
* lisp/eshell/esh-util.el (eshell-parse-ange-ls): Remove
older-Emacs compat code.
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/esh-util.el | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el index 4835e63baa9..082403130d4 100644 --- a/lisp/eshell/esh-util.el +++ b/lisp/eshell/esh-util.el | |||
| @@ -600,10 +600,7 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable. | |||
| 600 | (setq host-users (cdr host-users)) | 600 | (setq host-users (cdr host-users)) |
| 601 | (cdr (assoc user host-users)))))) | 601 | (cdr (assoc user host-users)))))) |
| 602 | 602 | ||
| 603 | ;; Add an autoload for parse-time-string | 603 | (autoload 'parse-time-string "parse-time") |
| 604 | (if (and (not (fboundp 'parse-time-string)) | ||
| 605 | (locate-library "parse-time")) | ||
| 606 | (autoload 'parse-time-string "parse-time")) | ||
| 607 | 604 | ||
| 608 | (eval-when-compile | 605 | (eval-when-compile |
| 609 | (require 'ange-ftp nil t)) ; ange-ftp-parse-filename | 606 | (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. | |||
| 649 | (size (string-to-number (match-string 5))) | 646 | (size (string-to-number (match-string 5))) |
| 650 | (name (ange-ftp-parse-filename)) | 647 | (name (ange-ftp-parse-filename)) |
| 651 | (mtime | 648 | (mtime |
| 652 | (if (fboundp 'parse-time-string) | 649 | (let ((moment (parse-time-string (match-string 6)))) |
| 653 | (let ((moment (parse-time-string | 650 | (if (nth 0 moment) |
| 654 | (match-string 6)))) | 651 | (setcar (nthcdr 5 moment) |
| 655 | (if (nth 0 moment) | 652 | (decoded-time-year (decode-time))) |
| 656 | (setcar (nthcdr 5 moment) | 653 | (setcar (nthcdr 0 moment) 0) |
| 657 | (decoded-time-year (decode-time))) | 654 | (setcar (nthcdr 1 moment) 0) |
| 658 | (setcar (nthcdr 0 moment) 0) | 655 | (setcar (nthcdr 2 moment) 0)) |
| 659 | (setcar (nthcdr 1 moment) 0) | 656 | (encode-time moment))) |
| 660 | (setcar (nthcdr 2 moment) 0)) | ||
| 661 | (encode-time moment)) | ||
| 662 | (ange-ftp-file-modtime (expand-file-name name dir)))) | ||
| 663 | symlink) | 657 | symlink) |
| 664 | (if (string-match "\\(.+\\) -> \\(.+\\)" name) | 658 | (if (string-match "\\(.+\\) -> \\(.+\\)" name) |
| 665 | (setq symlink (match-string 2 name) | 659 | (setq symlink (match-string 2 name) |