diff options
| author | Miles Bader <miles@gnu.org> | 2005-03-18 02:49:57 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-03-18 02:49:57 +0000 |
| commit | fa9a04e10b1f0a7b3e2a7808218309fc2a67abb2 (patch) | |
| tree | b297697b13d54a3510a7e1d0beb4f31811517444 /lisp/gnus/nnmaildir.el | |
| parent | 968a6679624d4e84c154a2f61f17defb6906b973 (diff) | |
| download | emacs-fa9a04e10b1f0a7b3e2a7808218309fc2a67abb2.tar.gz | |
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-187
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 39-44)
- Merge from emacs--cvs-trunk--0
- Update from CVS
2005-03-16 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/nnimap.el (nnimap-open-connection): Print which authinfo file is
used.
* lisp/gnus/nneething.el (nneething-map-file-directory): Derive from
`gnus-directory'.
* lisp/gnus/gnus-art.el (gnus-header-button-alist): Use `gnus-msg-mail' for
the To/Cc button.
2005-03-15 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/nnmaildir.el (nnmaildir-request-accept-article): Use
`nnheader-cancel-timer' for compatibility with current XEmacs.
2005-03-13 Steve Youngs <steve@sxemacs.org>
* lisp/gnus/gnus.el: Don't try and mark `gnus-agent-save-groups' as an
autoloaded function.
From: Andrey Slusar <anrays@gmail.com>.
2005-03-13 Steve Youngs <steve@sxemacs.org>
* lisp/gnus/mm-url.el: Require timer-funcs at compile time when in XEmacs
for `with-timeout'.
* lisp/gnus/mail-source.el: Require timer-funcs at compile time when in
XEmacs for `run-with-idle-timer'.
* lisp/gnus/gnus-async.el: Ditto.
* lisp/gnus/dgnushack.el: No need to ignore `run-with-idle-timer', XEmacs
has this function now.
Diffstat (limited to 'lisp/gnus/nnmaildir.el')
| -rw-r--r-- | lisp/gnus/nnmaildir.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el index 25cbbc8db48..618418907e8 100644 --- a/lisp/gnus/nnmaildir.el +++ b/lisp/gnus/nnmaildir.el @@ -1344,7 +1344,7 @@ by nnmaildir-request-article.") (write-region (point-min) (point-max) tmpfile nil 'no-message nil 'excl) (unix-sync))) ;; no fsync :( - (cancel-timer 24h) + (nnheader-cancel-timer 24h) (condition-case err (add-name-to-file tmpfile curfile) (error |