Mercurial > emacs
comparison lisp/gnus/gnus-diary.el @ 71531:770285b3deb5
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 111-112)
- Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-333
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 29 Jun 2006 22:54:24 +0000 |
| parents | 1077b8039c32 |
| children | 39576843be52 |
comparison
equal
deleted
inserted
replaced
| 71530:b1bdd8f8fdc0 | 71531:770285b3deb5 |
|---|---|
| 211 nndiary-headers)) | 211 nndiary-headers)) |
| 212 | 212 |
| 213 ;; #### NOTE: Gnus sometimes gives me a HEADER not corresponding to any | 213 ;; #### NOTE: Gnus sometimes gives me a HEADER not corresponding to any |
| 214 ;; message, with all fields set to nil here. I don't know what it is for, and | 214 ;; message, with all fields set to nil here. I don't know what it is for, and |
| 215 ;; I just ignore it. | 215 ;; I just ignore it. |
| 216 ;;;###autoload | |
| 216 (defun gnus-user-format-function-d (header) | 217 (defun gnus-user-format-function-d (header) |
| 217 ;; Returns an aproximative delay string for the next occurence of this | 218 ;; Returns an aproximative delay string for the next occurence of this |
| 218 ;; message. The delay is given only in the first non zero unit. | 219 ;; message. The delay is given only in the first non zero unit. |
| 219 ;; Code partly stolen from article-make-date-line | 220 ;; Code partly stolen from article-make-date-line |
| 220 (let* ((extras (mail-header-extra header)) | 221 (let* ((extras (mail-header-extra header)) |
| 247 )) | 248 )) |
| 248 | 249 |
| 249 ;; #### NOTE: Gnus sometimes gives me a HEADER not corresponding to any | 250 ;; #### NOTE: Gnus sometimes gives me a HEADER not corresponding to any |
| 250 ;; message, with all fields set to nil here. I don't know what it is for, and | 251 ;; message, with all fields set to nil here. I don't know what it is for, and |
| 251 ;; I just ignore it. | 252 ;; I just ignore it. |
| 253 ;;;###autoload | |
| 252 (defun gnus-user-format-function-D (header) | 254 (defun gnus-user-format-function-D (header) |
| 253 ;; Returns a formatted time string for the next occurence of this message. | 255 ;; Returns a formatted time string for the next occurence of this message. |
| 254 (let* ((extras (mail-header-extra header)) | 256 (let* ((extras (mail-header-extra header)) |
| 255 (sched (gnus-diary-header-schedule extras)) | 257 (sched (gnus-diary-header-schedule extras)) |
| 256 (occur (nndiary-next-occurence sched (current-time)))) | 258 (occur (nndiary-next-occurence sched (current-time)))) |