Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-72

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 41-43)

   - Update from CVS

2005-03-16  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/nnimap.el (nnimap-open-connection): Print which authinfo file is
   used.

   * lisp/nneething.el (nneething-map-file-directory): Derive from
   `gnus-directory'.

   * lisp/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/nnmaildir.el (nnmaildir-request-accept-article): Use
   `nnheader-cancel-timer' for compatibility with current XEmacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 374ed1f..5b16804 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+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-async.el: Require timer-funcs at compile time when in

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 8495f28..64b9b9a 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -6329,7 +6329,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/nneething.el b/lisp/nneething.el
index 1263602..e3b3d34 100644 (file)
--- a/lisp/nneething.el
+++ b/lisp/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/nnimap.el b/lisp/nnimap.el
index 6eb44ba..3e30c9e 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -773,7 +773,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 (netrc-parse nnimap-authinfo-file))
+    (let* ((list (progn (gnus-message 7 "Parsing authinfo file `%s'."
+                                     nnimap-authinfo-file)
+                       (netrc-parse nnimap-authinfo-file)))
           (port (if nnimap-server-port
                     (int-to-string nnimap-server-port)
                   "imap"))

diff --git a/lisp/nnmaildir.el b/lisp/nnmaildir.el
index 7b3fffd..76b0bb0 100644 (file)
--- a/lisp/nnmaildir.el
+++ b/lisp/nnmaildir.el
@@ -1395,8 +1395,9 @@ by nnmaildir-request-article.")
         (write-region (point-min) (point-max) tmpfile nil 'no-message nil
                       'excl)
         (unix-sync))) ;; no fsync :(
-      (cancel-timer 24h)
-      (condition-case err (add-name-to-file tmpfile curfile)
+      (nnheader-cancel-timer 24h)
+      (condition-case err
+         (add-name-to-file tmpfile curfile)
        (error
         (setf (nnmaildir--srv-error nnmaildir--cur-server)
               (concat "Error linking: " (prin1-to-string err)))