diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-12-10 19:13:08 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-12-10 19:13:08 -0500 |
| commit | 8e3217e7bc7672eeba8ed042e730f0da1e261cd0 (patch) | |
| tree | b28874c54ab71597a7dddd3d0fab0e1d10de2713 /lisp/eshell/em-pred.el | |
| parent | 54467310f586089f2b3f9e4fa46eaadb2ce08fd6 (diff) | |
| parent | 6be816dee8c9720dc39ff235b7b31d4190e06d57 (diff) | |
| download | emacs-8e3217e7bc7672eeba8ed042e730f0da1e261cd0.tar.gz | |
Merge from trunk
Diffstat (limited to 'lisp/eshell/em-pred.el')
| -rw-r--r-- | lisp/eshell/em-pred.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el index 15a3deea30c..2b5cb1a0dc4 100644 --- a/lisp/eshell/em-pred.el +++ b/lisp/eshell/em-pred.el @@ -427,7 +427,7 @@ returning the resultant string." (forward-char)) (if (looking-at "[0-9]+") (progn - (setq when (- (eshell-time-to-seconds (current-time)) + (setq when (- (float-time) (* (string-to-number (match-string 0)) quantum))) (goto-char (match-end 0))) @@ -444,7 +444,7 @@ returning the resultant string." (attrs (file-attributes file))) (unless attrs (error "Cannot stat file `%s'" file)) - (setq when (eshell-time-to-seconds (nth attr-index attrs)))) + (setq when (float-time (nth attr-index attrs)))) (goto-char (1+ end))) `(lambda (file) (let ((attrs (file-attributes file))) @@ -453,7 +453,7 @@ returning the resultant string." '< (if (eq qual ?+) '> - '=)) ,when (eshell-time-to-seconds + '=)) ,when (float-time (nth ,attr-index attrs)))))))) (defun eshell-pred-file-type (type) @@ -605,5 +605,4 @@ that 'ls -l' will show in the first column of its display. " ;; generated-autoload-file: "esh-groups.el" ;; End: -;; arch-tag: 8b5ce022-17f3-4c40-93c7-5faafaa63f31 ;;; em-pred.el ends here |