From 8ec92e35c75425ef1d58e2a4ea36569014c0f12e Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 16 Mar 2005 22:24:11 +0000 Subject: [PATCH] Synch to No Gnus 200503162122. --- lisp/ChangeLog | 18 +++++++++++++++++- lisp/gnus-art.el | 2 +- lisp/nneething.el | 3 ++- lisp/nnimap.el | 4 +++- lisp/nnmaildir.el | 5 +++-- 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d613a68..3bee3d0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,19 @@ +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-async.el: Require timer-funcs at compile time when in @@ -5,7 +21,7 @@ 2005-03-13 Steve Youngs - * lisp/gnus.el: Don't try and mark `gnus-agent-save-groups' as an + * gnus.el: Don't try and mark `gnus-agent-save-groups' as an autoloaded function. From: Andrey Slusar . diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 74e5b90..acce27c 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -6822,7 +6822,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 628e2a4..8987abb 100644 --- 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 ba1520c..c06914e 100644 --- a/lisp/nnimap.el +++ b/lisp/nnimap.el @@ -774,7 +774,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 416fe27..390084e 100644 --- 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))) -- 1.7.10.4