Mercurial > emacs
changeset 108981:b7963ca9e06e
Synch with Gnus trunk.
* gnus-util.el (gnus-date-get-time): Move up before first use.
| author | Romain Francoise <romain@orebokech.com> |
|---|---|
| date | Sat, 12 Jun 2010 19:26:40 +0200 |
| parents | c3dddc8e5767 |
| children | 684f6b36230b 81f2d1ac795c |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-util.el |
| diffstat | 2 files changed, 18 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Sat Jun 12 13:14:43 2010 -0400 +++ b/lisp/gnus/ChangeLog Sat Jun 12 19:26:40 2010 +0200 @@ -1,3 +1,7 @@ +2010-06-12 Romain Francoise <romain@orebokech.com> + + * gnus-util.el (gnus-date-get-time): Move up before first use. + 2010-06-10 Katsumi Yamaoka <yamaoka@jpl.org> * gnus-art.el (gnus-mime-buttonized-part-id): New internal variable.
--- a/lisp/gnus/gnus-util.el Sat Jun 12 13:14:43 2010 -0400 +++ b/lisp/gnus/gnus-util.el Sat Jun 12 19:26:40 2010 +0200 @@ -429,6 +429,20 @@ (+ (car now) (* (car (cdr now)) 60) (* (car (nthcdr 2 now)) 3600) (* (- (string-to-number days) 1) 3600 24)))) +(defmacro gnus-date-get-time (date) + "Convert DATE string to Emacs time. +Cache the result as a text property stored in DATE." + ;; Either return the cached value... + `(let ((d ,date)) + (if (equal "" d) + '(0 0) + (or (get-text-property 0 'gnus-time d) + ;; or compute the value... + (let ((time (safe-date-to-time d))) + ;; and store it back in the string. + (put-text-property 0 1 'gnus-time time d) + time))))) + (defvar gnus-user-date-format-alist '(((gnus-seconds-today) . "%k:%M") (604800 . "%a %k:%M") ;;that's one week @@ -480,20 +494,6 @@ (format-time-string "%d-%b" (gnus-date-get-time messy-date)) (error " - "))) -(defmacro gnus-date-get-time (date) - "Convert DATE string to Emacs time. -Cache the result as a text property stored in DATE." - ;; Either return the cached value... - `(let ((d ,date)) - (if (equal "" d) - '(0 0) - (or (get-text-property 0 'gnus-time d) - ;; or compute the value... - (let ((time (safe-date-to-time d))) - ;; and store it back in the string. - (put-text-property 0 1 'gnus-time time d) - time))))) - (defsubst gnus-time-iso8601 (time) "Return a string of TIME in YYYYMMDDTHHMMSS format." (format-time-string "%Y%m%dT%H%M%S" time))