diff options
| author | Gnus developers <ding@gnus.org> | 2011-07-03 22:17:49 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-07-03 22:17:49 +0000 |
| commit | cd865a33698f9414392a009c51abd6d18a1506bf (patch) | |
| tree | 91518c30bcf53e85de5c181853b42164fe12d8ab /lisp/gnus/pop3.el | |
| parent | 1485f4c03a3e887f8e60fefb96e5e3d9ca484cf7 (diff) | |
| download | emacs-cd865a33698f9414392a009c51abd6d18a1506bf.tar.gz | |
Merge changes made in Gnus trunk.
gnus.texi (Subscription Methods): Link to "Group Levels" to explain zombies. (Checking New Groups): Ditto (bug#8974).
gnus.texi (Startup Files): Clarify that we're talking about numbered backups, and not actual vc (bug#8975).
gnus-group.el (gnus-read-ephemeral-bug-group): Bind the coding systems to binary before writing and reading the mbox files.
gnus.el (gnus-summary-line-format): Link to the info node for %U instead of trying to list them all (bug#8978).
pop3.el (pop3-open-server): Use :end-of-capability.
gnus-group.el (gnus-read-ephemeral-emacs-bug-group): Make sure that the id is always a number.
gnus-group.el (gnus-read-ephemeral-emacs-bug-group): Hook into debbugs mode, if possible.
Diffstat (limited to 'lisp/gnus/pop3.el')
| -rw-r--r-- | lisp/gnus/pop3.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el index 90e11b3ca8f..b485ac39f60 100644 --- a/lisp/gnus/pop3.el +++ b/lisp/gnus/pop3.el @@ -306,7 +306,8 @@ Returns the process associated with the connection." (t (or pop3-stream-type 'network))) :capability-command "CAPA\r\n" - :end-of-command "^\\.\r?\n\\|^\\(-ERR\\|+OK \\).*\n" + :end-of-command "^\\(-ERR\\|+OK \\).*\n" + :end-of-capability "^\\.\r?\n" :success "^\\+OK.*\n" :return-list t :starttls-function |