[Emacs-diffs] /srv/bzr/emacs/trunk r100593: Synch with Gnus trunk.

[Romain Francoise]

------------------------------------------------------------
revno: 100593
committer: Romain Francoise <address@hidden>
branch nick: trunk
timestamp: Sat 2010-06-12 19:26:40 +0200
message:
  Synch with Gnus trunk.
  * gnus-util.el (gnus-date-get-time): Move up before first use.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-util.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-06-10 05:33:55 +0000
+++ b/lisp/gnus/ChangeLog       2010-06-12 17:26:40 +0000
@@ -1,3 +1,7 @@
+2010-06-12  Romain Francoise  <address@hidden>
+
+       * gnus-util.el (gnus-date-get-time): Move up before first use.
+
 2010-06-10  Katsumi Yamaoka  <address@hidden>
 
        * gnus-art.el (gnus-mime-buttonized-part-id): New internal variable.

=== modified file 'lisp/gnus/gnus-util.el'
--- a/lisp/gnus/gnus-util.el    2010-06-10 00:30:13 +0000
+++ b/lisp/gnus/gnus-util.el    2010-06-12 17:26:40 +0000
@@ -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))