mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
Merge changes made in Gnus trunk.
gnus.texi (Article Date): Clarify gnus-article-update-date-headers. gnus-msg.el (gnus-inews-add-send-actions): Restore the winconf name after exit. gnus-sum.el (gnus-summary-show-article): When called with t as the value, show the raw article. nnimap.el (nnimap-open-connection-1): Revert last change, since auth-source now accepts numbers. auth-source.el (auth-source-netrc-parse): Accept a number as the port spec, too. (auth-source-ensure-strings): New function. gnus-art.el (gnus-article-update-date-headers): Doc fix. (gnus-article-setup-buffer): Always restart the date timer so that user changes to the frequency is respected. nnimap.el (nnimap-open-connection-1): auth-source expects strings as port numbers, so make sure it gets that if nnimap-server-port is explicit. nnimap.el (nnimap-inbox): Doc fix.
This commit is contained in:
parent
2f8f196d1f
commit
8e22bee040
8 changed files with 65 additions and 18 deletions
|
|
@ -680,6 +680,15 @@ while \(:host t) would find all host entries."
|
|||
|
||||
;;; Backend specific parsing: netrc/authinfo backend
|
||||
|
||||
(defun auth-source-ensure-strings (values)
|
||||
(unless (listp values)
|
||||
(setq values (list values)))
|
||||
(mapcar (lambda (value)
|
||||
(if (numberp value)
|
||||
(format "%s" value)
|
||||
value))
|
||||
values))
|
||||
|
||||
(defvar auth-source-netrc-cache nil)
|
||||
|
||||
;;; (auth-source-netrc-parse "~/.authinfo.gpg")
|
||||
|
|
@ -693,6 +702,7 @@ Note that the MAX parameter is used so we can exit the parse early."
|
|||
;; We got already parsed contents; just return it.
|
||||
file
|
||||
(when (file-exists-p file)
|
||||
(setq port (auth-source-ensure-strings port))
|
||||
(with-temp-buffer
|
||||
(let ((tokens '("machine" "host" "default" "login" "user"
|
||||
"password" "account" "macdef" "force"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue