Merge from emacs-23

[gnu-emacs] / lisp / eshell / em-pred.el

diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el
index 8fbedda3e7ec3ffec9b100b54981c9370d9a7ace..3b7e9fd63634b7f65005065fa921caca37d555b9 100644 (file)
--- a/lisp/eshell/em-pred.el
+++ b/lisp/eshell/em-pred.el
@@ -61,7 +61,7 @@ ordinary strings."
 ;;; User Variables:
 
 (defcustom eshell-pred-load-hook '(eshell-pred-initialize)
-  "*A list of functions to run when `eshell-pred' is loaded."
+  "A list of functions to run when `eshell-pred' is loaded."
   :type 'hook
   :group 'eshell-pred)
 
@@ -101,7 +101,7 @@ ordinary strings."
     (?m . (eshell-pred-file-time ?m "modification" 5))
     (?c . (eshell-pred-file-time ?c "change" 6))
     (?L . (eshell-pred-file-size)))
-  "*A list of predicates than can be applied to a globbing pattern.
+  "A list of predicates than can be applied to a globbing pattern.
 The format of each entry is
 
   (CHAR . PREDICATE-FUNC-SEXP)"
@@ -150,7 +150,7 @@ The format of each entry is
                (eshell-pred-substitute t)
              (error "`g' modifier cannot be used alone"))))
     (?s . (eshell-pred-substitute)))
-  "*A list of modifiers than can be applied to an argument expansion.
+  "A list of modifiers than can be applied to an argument expansion.
 The format of each entry is
 
   (CHAR ENTRYWISE-P MODIFIER-FUNC-SEXP)"
@@ -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