diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-07-03 16:51:42 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-07-03 16:51:42 -0700 |
| commit | 7b9430b4506b59298120a08737be9f4ad5b9cd49 (patch) | |
| tree | b503af46f63e1bd0e00ac1384f525e76493ba65b /lisp/type-break.el | |
| parent | 1e49bfab49317e46540f13c4091200b211c24ba6 (diff) | |
| download | emacs-7b9430b4506b59298120a08737be9f4ad5b9cd49.tar.gz emacs-7b9430b4506b59298120a08737be9f4ad5b9cd49.tar.bz2 emacs-7b9430b4506b59298120a08737be9f4ad5b9cd49.zip | |
* type-break.el: Accept time formats that the builtins accept.
(timep, type-break-time-difference): Accept any format that
float-time accepts, rather than insisting on (HIGH LOW USECS) format.
This is simpler and helps future-proof the code.
(type-break-time-difference): Round rather than ignoring
subseconds components.
Diffstat (limited to 'lisp/type-break.el')
| -rw-r--r-- | lisp/type-break.el | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/lisp/type-break.el b/lisp/type-break.el index 2d6960c77bc..612c8cf4617 100644 --- a/lisp/type-break.el +++ b/lisp/type-break.el @@ -47,7 +47,7 @@ ;; or set the variable of the same name to `t'. ;; This program can truly cons up a storm because of all the calls to -;; `current-time' (which always returns 3 fresh conses). I'm dismayed by +;; `current-time' (which always returns fresh conses). I'm dismayed by ;; this, but I think the health of my hands is far more important than a ;; few pages of virtual memory. @@ -501,12 +501,9 @@ variable of the same name." (defun timep (time) "If TIME is in the format returned by `current-time' then return TIME, else return nil." - (and (listp time) - (eq (length time) 3) - (integerp (car time)) - (integerp (nth 1 time)) - (integerp (nth 2 time)) - time)) + (condition-case nil + (progn (float-time time) time) + (error nil))) (defun type-break-choose-file () "Return file to read from." @@ -993,12 +990,8 @@ FRAC should be the inverse of the fractional value; for example, a value of ;; Compute the difference, in seconds, between a and b, two structures ;; similar to those returned by `current-time'. -;; Use addition rather than logand since that is more robust; the low 16 -;; bits of the seconds might have been incremented, making it more than 16 -;; bits wide. (defun type-break-time-difference (a b) - (+ (lsh (- (car b) (car a)) 16) - (- (car (cdr b)) (car (cdr a))))) + (round (float-time (time-subtract b a)))) ;; Return (in a new list the same in structure to that returned by ;; `current-time') the sum of the arguments. Each argument may be a time |