diff options
| author | Miles Bader <miles@gnu.org> | 2008-03-10 00:50:22 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-03-10 00:50:22 +0000 |
| commit | 8f7abae3a9c0dcb827f50688e802d634c7461ece (patch) | |
| tree | fb3d3a87b3fef4ddb3e308aa57c378f424a2dc18 /lisp/net | |
| parent | 390b81fa98fa581afe965a2943d81d7dd07f0dc5 (diff) | |
| download | emacs-8f7abae3a9c0dcb827f50688e802d634c7461ece.tar.gz emacs-8f7abae3a9c0dcb827f50688e802d634c7461ece.tar.bz2 emacs-8f7abae3a9c0dcb827f50688e802d634c7461ece.zip | |
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1097
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/imap.el | 1 | ||||
| -rw-r--r-- | lisp/net/netrc.el | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/net/imap.el b/lisp/net/imap.el index 2ec29252d47..399d5ec8237 100644 --- a/lisp/net/imap.el +++ b/lisp/net/imap.el @@ -2923,6 +2923,7 @@ Return nil if no complete line has arrived." imap-open-1 imap-open imap-opened + imap-ping-server imap-authenticate imap-close imap-capability diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el index 8c588a11451..de82ae7473d 100644 --- a/lisp/net/netrc.el +++ b/lisp/net/netrc.el @@ -61,7 +61,7 @@ (defun netrc-parse (file) (interactive "fFile to Parse: ") - "Parse FILE and return an list of all entries in the file." + "Parse FILE and return a list of all entries in the file." (when (file-exists-p file) (with-temp-buffer (let ((tokens '("machine" "default" "login" |