Mercurial > emacs
changeset 94980:51e9d65c90fc
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1161
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 15 May 2008 00:26:27 +0000 |
| parents | d5934ba74299 |
| children | e01e37b8203e |
| files | lisp/gnus/ChangeLog lisp/gnus/auth-source.el lisp/gnus/nnimap.el lisp/gnus/nnrss.el |
| diffstat | 4 files changed, 27 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Thu May 15 00:12:08 2008 +0000 +++ b/lisp/gnus/ChangeLog Thu May 15 00:26:27 2008 +0000 @@ -1,3 +1,13 @@ +2008-05-14 Teodor Zlatanov <tzz@lifelogs.com> + + * nnimap.el (nnimap-open-connection): Fix login/password bug. + + * nnrss.el (nnrss-normalize-date): Accept Unix-style epoch timestamps. + + * auth-source.el: Preliminary Tramp docs. + (auth-sources): Change the default auth-sources to use + EPA .gpg files. + 2008-05-09 Teodor Zlatanov <tzz@lifelogs.com> * nntp.el: Autoload `auth-source-user-or-password'.
--- a/lisp/gnus/auth-source.el Thu May 15 00:12:08 2008 +0000 +++ b/lisp/gnus/auth-source.el Thu May 15 00:26:27 2008 +0000 @@ -47,6 +47,15 @@ ;;; digest). If you want finer controls, explore the url-auth source ;;; code and variables. +;;; (Tramp patch pending for this!) +;;; For tramp authentication, use: + +;;; machine yourmachine.com port tramp login testuser password testpass + +;;; Note that the port can be scp or ssh, for example, to match only +;;; those protocols. When you use port = tramp, you match any Tramp +;;; protocol. + ;;; Code: (require 'gnus-util) @@ -83,8 +92,7 @@ p))) auth-source-protocols)) -;;; this default will be changed to ~/.authinfo.gpg -(defcustom auth-sources '((:source "~/.authinfo.enc" :host t :protocol t)) +(defcustom auth-sources '((:source "~/.authinfo.gpg" :host t :protocol t)) "List of authentication sources. Each entry is the authentication type with optional properties."
--- a/lisp/gnus/nnimap.el Thu May 15 00:12:08 2008 +0000 +++ b/lisp/gnus/nnimap.el Thu May 15 00:26:27 2008 +0000 @@ -810,7 +810,7 @@ (list port) (list "imap" "imaps" "143" "993")))) (passwd (or - (auth-source-user-or-password "login" server port) ; this is preferred to netrc-* + (auth-source-user-or-password "password" server port) ; this is preferred to netrc-* (netrc-machine-user-or-password "password" list
--- a/lisp/gnus/nnrss.el Thu May 15 00:12:08 2008 +0000 +++ b/lisp/gnus/nnrss.el Thu May 15 00:26:27 2008 +0000 @@ -498,8 +498,11 @@ This function handles the ISO 8601 date format described in <URL:http://www.w3.org/TR/NOTE-datetime>, and also the RFC822 style which RSS 2.0 allows." - (let (case-fold-search vector year month day time zone cts) - (cond ((null date)) + (let (case-fold-search vector year month day time zone cts given) + (cond ((null date)) ; do nothing for this case + ;; if the date is just digits (unix time stamp): + ((string-match "^[0-9]+$" date) + (setq given (seconds-to-time (string-to-number date)))) ;; RFC822 ((string-match " [0-9]+ " date) (setq vector (timezone-parse-date date) @@ -557,7 +560,7 @@ (if zone (concat " " zone) ""))) - (message-make-date)))) + (message-make-date given)))) ;;; data functions