Mercurial > emacs
changeset 60696:7503b2a24a3c
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.
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 18 Mar 2005 02:49:57 +0000 |
| parents | d8c3512bc427 |
| children | d9c9ad74e719 |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-art.el lisp/gnus/gnus-async.el lisp/gnus/gnus.el lisp/gnus/mail-source.el lisp/gnus/mm-url.el lisp/gnus/nneething.el lisp/gnus/nnimap.el lisp/gnus/nnmaildir.el |
| diffstat | 9 files changed, 51 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Fri Mar 18 02:25:13 2005 +0000 +++ b/lisp/gnus/ChangeLog Fri Mar 18 02:49:57 2005 +0000 @@ -1,3 +1,38 @@ +2005-03-16 Reiner Steib <Reiner.Steib@gmx.de> + + * nnimap.el (nnimap-open-connection): Print which authinfo file is + used. + + * nneething.el (nneething-map-file-directory): Derive from + `gnus-directory'. + + * 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> + + * nnmaildir.el (nnmaildir-request-accept-article): Use + `nnheader-cancel-timer' for compatibility with current XEmacs. + +2005-03-13 Steve Youngs <steve@sxemacs.org> + + * 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> + + * mm-url.el: Require timer-funcs at compile time when in XEmacs + for `with-timeout'. + + * mail-source.el: Require timer-funcs at compile time when in + XEmacs for `run-with-idle-timer'. + + * gnus-async.el: Ditto. + + * dgnushack.el: No need to ignore `run-with-idle-timer', XEmacs + has this function now. + 2005-03-16 Lute Kamstra <lute@gnu.org> * message.el (message-make-date): Require parse-time.
--- a/lisp/gnus/gnus-art.el Fri Mar 18 02:25:13 2005 +0000 +++ b/lisp/gnus/gnus-art.el Fri Mar 18 02:49:57 2005 +0000 @@ -6336,7 +6336,7 @@ ("^\\(From\\|Reply-To\\):" ": *\\(.+\\)$" 1 (>= gnus-button-message-level 0) gnus-button-reply 1) ("^\\(Cc\\|To\\):" "[^ \t\n<>,()\"]+@[^ \t\n<>,()\"]+" - 0 (>= gnus-button-message-level 0) gnus-button-mailto 0) + 0 (>= gnus-button-message-level 0) gnus-msg-mail 0) ("^X-[Uu][Rr][Ll]:" gnus-button-url-regexp 0 (>= gnus-button-browse-level 0) browse-url 0) ("^Subject:" gnus-button-url-regexp
--- a/lisp/gnus/gnus-async.el Fri Mar 18 02:25:13 2005 +0000 +++ b/lisp/gnus/gnus-async.el Fri Mar 18 02:49:57 2005 +0000 @@ -32,6 +32,10 @@ (require 'gnus-sum) (require 'nntp) +(eval-when-compile + (when (featurep 'xemacs) + (require 'timer-funcs))) + (defgroup gnus-asynchronous nil "Support for asynchronous operations." :group 'gnus)
--- a/lisp/gnus/gnus.el Fri Mar 18 02:25:13 2005 +0000 +++ b/lisp/gnus/gnus.el Fri Mar 18 02:49:57 2005 +0000 @@ -2726,7 +2726,7 @@ gnus-async-prefetch-article gnus-async-prefetch-remove-group gnus-async-halt-prefetch) ("gnus-agent" gnus-open-agent gnus-agent-get-function - gnus-agent-save-groups gnus-agent-save-active gnus-agent-method-p + gnus-agent-save-active gnus-agent-method-p gnus-agent-get-undownloaded-list gnus-agent-fetch-session gnus-summary-set-agent-mark gnus-agent-save-group-info gnus-agent-request-article gnus-agent-retrieve-headers)
--- a/lisp/gnus/mail-source.el Fri Mar 18 02:25:13 2005 +0000 +++ b/lisp/gnus/mail-source.el Fri Mar 18 02:49:57 2005 +0000 @@ -862,7 +862,7 @@ (eval-when-compile (if (featurep 'xemacs) - (require 'itimer) + (require 'timer-funcs) (require 'timer))) (defun mail-source-start-idle-timer ()
--- a/lisp/gnus/mm-url.el Fri Mar 18 02:25:13 2005 +0000 +++ b/lisp/gnus/mm-url.el Fri Mar 18 02:49:57 2005 +0000 @@ -38,7 +38,9 @@ (autoload 'executable-find "executable")) (eval-when-compile - (require 'timer)) + (if (featurep 'xemacs) + (require 'timer-funcs) + (require 'timer))) (defgroup mm-url nil "A wrapper of url package and external url command for Gnus."
--- a/lisp/gnus/nneething.el Fri Mar 18 02:25:13 2005 +0000 +++ b/lisp/gnus/nneething.el Fri Mar 18 02:49:57 2005 +0000 @@ -37,7 +37,8 @@ (nnoo-declare nneething) -(defvoo nneething-map-file-directory "~/.nneething/" +(defvoo nneething-map-file-directory + (nnheader-concat gnus-directory ".nneething/") "Where nneething stores the map files.") (defvoo nneething-map-file ".nneething"
--- a/lisp/gnus/nnimap.el Fri Mar 18 02:25:13 2005 +0000 +++ b/lisp/gnus/nnimap.el Fri Mar 18 02:49:57 2005 +0000 @@ -728,7 +728,9 @@ (imap-capability 'IMAP4rev1 nnimap-server-buffer)) (imap-close nnimap-server-buffer) (nnheader-report 'nnimap "Server %s is not IMAP4 compliant" server)) - (let* ((list (gnus-parse-netrc nnimap-authinfo-file)) + (let* ((list (progn (gnus-message 7 "Parsing authinfo file `%s'." + nnimap-authinfo-file) + (gnus-parse-netrc nnimap-authinfo-file))) (port (if nnimap-server-port (int-to-string nnimap-server-port) "imap"))
--- a/lisp/gnus/nnmaildir.el Fri Mar 18 02:25:13 2005 +0000 +++ b/lisp/gnus/nnmaildir.el Fri Mar 18 02:49:57 2005 +0000 @@ -1344,7 +1344,7 @@ (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