Mercurial > emacs
comparison lisp/net/netrc.el @ 110666:3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
nnimap.el (nnimap-find-article-by-message-id): Use EXAMINE instead of SELECT to get the message-id.
gnus-art.el, gnus.el, nnimap.el: Fix up make-obsolete-variable declarations throughout.
gnus.texi (Mail Source Specifiers): Remove webmail.el mentions.
mail-source.el: Removed webmail support.
nntp.el (nntp-server-list-active-group): Document.
gnus.texi (NNTP): Document nntp-server-list-active-group.
gnus.texi (Customizing the IMAP Connection): Remove extra quote.
nnimap.el (nnimap-find-article-by-message-id): Really return the article number.
nnimap.el: Add nnimap-split-fancy.
netrc.el (netrc-credentials, netrc-machine): Return the value of the "default" entry.
nnimap.el: Use tls.el exclusively, and not starttls.el at all.
nnimap.el (nnimap-wait-for-connection): Accept the moronic openssl s_client -starttls output, too.
nnrss.el (nnrss-use-local): Add documentation.
message.el (message-ignored-supersedes-headers): Strip Injection-* headers before superseding.
nnimap.el (nnimap-open-connection): Reinstate the auto-upgrade from unencrypted to STARTTLS, if possible.
nnir.el: Use the server names without suffixes.
gnus-sum.el (gnus-summary-show-thread): Skip past invisible text when expanding threads.
gnus-registry.el: Don't follow nnmairix references. Install the nnregistry refer method.
gnus.texi (Spam Package Configuration Examples, SpamOracle): Remove nnimap-split-rule from examples.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Fri, 01 Oct 2010 00:25:50 +0000 |
| parents | 867180d035b0 |
| children | db63bc492d85 |
comparison
equal
deleted
inserted
replaced
| 110665:49d445615c07 | 110666:3b9bd3888ee9 |
|---|---|
| 129 (pop list)) | 129 (pop list)) |
| 130 (unless result | 130 (unless result |
| 131 ;; No machine name matches, so we look for default entries. | 131 ;; No machine name matches, so we look for default entries. |
| 132 (while rest | 132 (while rest |
| 133 (when (assoc "default" (car rest)) | 133 (when (assoc "default" (car rest)) |
| 134 (push (car rest) result)) | 134 (let ((elem (car rest))) |
| 135 (setq elem (delete (assoc "default" elem) elem)) | |
| 136 (push elem result))) | |
| 135 (pop rest))) | 137 (pop rest))) |
| 136 (when result | 138 (when result |
| 137 (setq result (nreverse result)) | 139 (setq result (nreverse result)) |
| 138 (while (and result | 140 (if (not port) |
| 139 (not (netrc-port-equal | 141 (car result) |
| 140 (or port defaultport "nntp") | 142 (while (and result |
| 141 ;; when port is not given in the netrc file, | 143 (not (netrc-port-equal |
| 142 ;; it should mean "any port" | 144 (or port defaultport "nntp") |
| 143 (or (netrc-get (car result) "port") | 145 ;; when port is not given in the netrc file, |
| 144 defaultport port)))) | 146 ;; it should mean "any port" |
| 145 (pop result)) | 147 (or (netrc-get (car result) "port") |
| 146 (car result)))) | 148 defaultport port)))) |
| 149 (pop result)) | |
| 150 (car result))))) | |
| 147 | 151 |
| 148 (defun netrc-machine-user-or-password (mode authinfo-file-or-list machines ports defaults) | 152 (defun netrc-machine-user-or-password (mode authinfo-file-or-list machines ports defaults) |
| 149 "Get the user name or password according to MODE from AUTHINFO-FILE-OR-LIST. | 153 "Get the user name or password according to MODE from AUTHINFO-FILE-OR-LIST. |
| 150 Matches a machine from MACHINES and a port from PORTS, giving | 154 Matches a machine from MACHINES and a port from PORTS, giving |
| 151 default ports DEFAULTS to `netrc-machine'. | 155 default ports DEFAULTS to `netrc-machine'. |
| 236 "Return a user name/password pair. | 240 "Return a user name/password pair. |
| 237 Port specifications will be prioritised in the order they are | 241 Port specifications will be prioritised in the order they are |
| 238 listed in the PORTS list." | 242 listed in the PORTS list." |
| 239 (let ((list (netrc-parse)) | 243 (let ((list (netrc-parse)) |
| 240 found) | 244 found) |
| 241 (while (and ports | 245 (if (not ports) |
| 242 (not found)) | 246 (setq found (netrc-machine list machine)) |
| 243 (setq found (netrc-machine list machine (pop ports)))) | 247 (while (and ports |
| 248 (not found)) | |
| 249 (setq found (netrc-machine list machine (pop ports))))) | |
| 244 (when found | 250 (when found |
| 245 (list (cdr (assoc "login" found)) | 251 (list (cdr (assoc "login" found)) |
| 246 (cdr (assoc "password" found)))))) | 252 (cdr (assoc "password" found)))))) |
| 247 | 253 |
| 248 (provide 'netrc) | 254 (provide 'netrc) |