1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-08 20:58:58 +00:00

Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1161
This commit is contained in:
Miles Bader 2008-05-15 00:26:27 +00:00
parent 4e02f55c17
commit 4079589f63
4 changed files with 27 additions and 6 deletions

View File

@ -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'.

View File

@ -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."

View File

@ -810,7 +810,7 @@ If EXAMINE is non-nil the group is selected read-only."
(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

View File

@ -498,8 +498,11 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s"
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 @@ which RSS 2.0 allows."
(if zone
(concat " " zone)
"")))
(message-make-date))))
(message-make-date given))))
;;; data functions