From fa9a04e10b1f0a7b3e2a7808218309fc2a67abb2 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Fri, 18 Mar 2005 02:49:57 +0000 Subject: [PATCH] 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 * 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 * lisp/gnus/nnmaildir.el (nnmaildir-request-accept-article): Use `nnheader-cancel-timer' for compatibility with current XEmacs. 2005-03-13 Steve Youngs * lisp/gnus/gnus.el: Don't try and mark `gnus-agent-save-groups' as an autoloaded function. From: Andrey Slusar . 2005-03-13 Steve Youngs * 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. --- lisp/gnus/ChangeLog | 35 +++++++++++++++++++++++++++++++++++ lisp/gnus/gnus-art.el | 2 +- lisp/gnus/gnus-async.el | 4 ++++ lisp/gnus/gnus.el | 2 +- lisp/gnus/mail-source.el | 2 +- lisp/gnus/mm-url.el | 4 +++- lisp/gnus/nneething.el | 3 ++- lisp/gnus/nnimap.el | 4 +++- lisp/gnus/nnmaildir.el | 2 +- 9 files changed, 51 insertions(+), 7 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 71d8dc2979b..b997b86b0c8 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,38 @@ +2005-03-16 Reiner Steib + + * 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 + + * nnmaildir.el (nnmaildir-request-accept-article): Use + `nnheader-cancel-timer' for compatibility with current XEmacs. + +2005-03-13 Steve Youngs + + * gnus.el: Don't try and mark `gnus-agent-save-groups' as an + autoloaded function. + From: Andrey Slusar . + +2005-03-13 Steve Youngs + + * 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 * message.el (message-make-date): Require parse-time. diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 1fe9348f759..ff04bfbb56f 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -6336,7 +6336,7 @@ variable it the real callback function." ("^\\(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 diff --git a/lisp/gnus/gnus-async.el b/lisp/gnus/gnus-async.el index 43ab0bc887d..fef7228d13b 100644 --- a/lisp/gnus/gnus-async.el +++ b/lisp/gnus/gnus-async.el @@ -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) diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index fa1da9e82f8..3112a07cb2e 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -2726,7 +2726,7 @@ gnus-registry.el will populate this if it's loaded.") 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) diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el index 6ff642ac24b..e9cee4fa6f2 100644 --- a/lisp/gnus/mail-source.el +++ b/lisp/gnus/mail-source.el @@ -862,7 +862,7 @@ See the Gnus manual for details." (eval-when-compile (if (featurep 'xemacs) - (require 'itimer) + (require 'timer-funcs) (require 'timer))) (defun mail-source-start-idle-timer () diff --git a/lisp/gnus/mm-url.el b/lisp/gnus/mm-url.el index 29d956ba64f..a66c03908eb 100644 --- a/lisp/gnus/mm-url.el +++ b/lisp/gnus/mm-url.el @@ -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." diff --git a/lisp/gnus/nneething.el b/lisp/gnus/nneething.el index 7028e239a52..d7698efb845 100644 --- a/lisp/gnus/nneething.el +++ b/lisp/gnus/nneething.el @@ -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" diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 09d9aef6f31..06bc1d76134 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -728,7 +728,9 @@ If EXAMINE is non-nil the group is selected read-only." (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")) 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 -- 2.39.2