diff options
| author | Glenn Morris | 2009-09-02 06:38:07 +0000 |
|---|---|---|
| committer | Glenn Morris | 2009-09-02 06:38:07 +0000 |
| commit | 1a727c75ac2918b0e82f69fac645f34af7fa93b2 (patch) | |
| tree | 6f47d55ed7d64b128985b7073be2c47d489b2f90 | |
| parent | c506adde9f36bae5fd501e58a1e064f810b2be5e (diff) | |
| download | emacs-1a727c75ac2918b0e82f69fac645f34af7fa93b2.tar.gz emacs-1a727c75ac2918b0e82f69fac645f34af7fa93b2.zip | |
Pass no argument to gnus-float-time rather than current-time.
| -rw-r--r-- | lisp/gnus/gnus-delay.el | 5 | ||||
| -rw-r--r-- | lisp/gnus/gnus-util.el | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lisp/gnus/gnus-delay.el b/lisp/gnus/gnus-delay.el index bd781f9df30..eb227d934cd 100644 --- a/lisp/gnus/gnus-delay.el +++ b/lisp/gnus/gnus-delay.el | |||
| @@ -105,7 +105,7 @@ DELAY is a string, giving the length of the time. Possible values are: | |||
| 105 | (setq deadline (gnus-float-time (apply 'encode-time | 105 | (setq deadline (gnus-float-time (apply 'encode-time |
| 106 | (append deadline nil)))) | 106 | (append deadline nil)))) |
| 107 | ;; If this time has passed already, add a day. | 107 | ;; If this time has passed already, add a day. |
| 108 | (when (< deadline (gnus-float-time (current-time))) | 108 | (when (< deadline (gnus-float-time)) |
| 109 | (setq deadline (+ 3600 deadline))) ;3600 secs/day | 109 | (setq deadline (+ 3600 deadline))) ;3600 secs/day |
| 110 | ;; Convert seconds to date header. | 110 | ;; Convert seconds to date header. |
| 111 | (setq deadline (message-make-date | 111 | (setq deadline (message-make-date |
| @@ -128,8 +128,7 @@ DELAY is a string, giving the length of the time. Possible values are: | |||
| 128 | (t | 128 | (t |
| 129 | (setq delay (* num 60)))) | 129 | (setq delay (* num 60)))) |
| 130 | (setq deadline (message-make-date | 130 | (setq deadline (message-make-date |
| 131 | (seconds-to-time (+ (gnus-float-time (current-time)) | 131 | (seconds-to-time (+ (gnus-float-time) delay))))) |
| 132 | delay))))) | ||
| 133 | (t (error "Malformed delay `%s'" delay))) | 132 | (t (error "Malformed delay `%s'" delay))) |
| 134 | (message-add-header (format "%s: %s" gnus-delay-header deadline))) | 133 | (message-add-header (format "%s: %s" gnus-delay-header deadline))) |
| 135 | (set-buffer-modified-p t) | 134 | (set-buffer-modified-p t) |
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index fb2cdbce118..bd870a2f1c8 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el | |||
| @@ -451,7 +451,7 @@ Returns \" ? \" if there's bad input or if an other error occurs. | |||
| 451 | Input should look like this: \"Sun, 14 Oct 2001 13:34:39 +0200\"." | 451 | Input should look like this: \"Sun, 14 Oct 2001 13:34:39 +0200\"." |
| 452 | (condition-case () | 452 | (condition-case () |
| 453 | (let* ((messy-date (gnus-float-time (safe-date-to-time messy-date))) | 453 | (let* ((messy-date (gnus-float-time (safe-date-to-time messy-date))) |
| 454 | (now (gnus-float-time (current-time))) | 454 | (now (gnus-float-time)) |
| 455 | ;;If we don't find something suitable we'll use this one | 455 | ;;If we don't find something suitable we'll use this one |
| 456 | (my-format "%b %d '%y")) | 456 | (my-format "%b %d '%y")) |
| 457 | (let* ((difference (- now messy-date)) | 457 | (let* ((difference (- now messy-date)) |