Merge from origin/emacs-24

[gnu-emacs] / lisp / type-break.el

diff --git a/lisp/type-break.el b/lisp/type-break.el
index 58e56214bafb9b874a4122d108f2eff8805adae2..a5a31c9ffd1dd3e920e0089e8fd1774513c28de5 100644 (file)
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -605,8 +605,7 @@ INTERVAL is the full length of an interval (defaults to TIME)."
   (type-break-time-warning-schedule time 'reset)
   (type-break-run-at-time (max 1 time) nil 'type-break-alarm)
   (setq type-break-time-next-break
-        (type-break-time-sum (or start (current-time))
-                             (or interval time))))
+        (type-break-time-sum start (or interval time))))
 
 (defun type-break-cancel-schedule ()
   (type-break-cancel-time-warning-schedule)
@@ -962,19 +961,11 @@ FRAC should be the inverse of the fractional value; for example, a value of
 (defun type-break-time-difference (a b)
   (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
-;; list or a single integer, a number of seconds.
-;; This function keeps the high and low 16 bits of the seconds properly
-;; balanced so that the lower value never exceeds 16 bits.  Otherwise, when
-;; the result is passed to `current-time-string' it will toss some of the
-;; "low" bits and format the time incorrectly.
+;; Return a time value that is the sum of the time-value arguments.
 (defun type-break-time-sum (&rest tmlist)
-  (let ((sum '(0 0 0)))
+  (let ((sum '(0 0)))
     (dolist (tem tmlist)
-      (setq sum (time-add sum (if (integerp tem)
-                                 (list (floor tem 65536) (mod tem 65536))
-                               tem))))
+      (setq sum (time-add sum tem)))
     sum))
 
 (defun type-break-time-stamp (&optional when)