diff options
| author | Gnus developers <ding@gnus.org> | 2011-07-05 22:27:16 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-07-05 22:27:16 +0000 |
| commit | d30dd079c92097ac9eee48d574ce609da778b50f (patch) | |
| tree | cac68c7b7f6811d28ccd8257459c2ca50ea6a7a7 /lisp/gnus/pop3.el | |
| parent | 0e4260bf5d321e16e1a0261b10a6305ac06819ff (diff) | |
| download | emacs-d30dd079c92097ac9eee48d574ce609da778b50f.tar.gz | |
Merge changes made in Gnus trunk.
gnus.texi (Expiring Mail): Document gnus-auto-expirable-marks.
nnir.el (nnir-notmuch-program, nnir-notmuch-additional-switches, nnir-notmuch-remove-prefix, nnir-engines, nnir-run-notmuch): New nnir `notmuch' backend.
mm-decode.el (mm-text-html-renderer): Doc fix.
gnus-msg.el (gnus-bug): Fix the MML tag.
pop3.el (pop3-open-server): -ERR is a valid response to CAPA.
gnus-start.el (gnus-get-unread-articles): Don't connect to the secondary methods if started with `gnus-no-server'.
gnus-group.el (gnus-read-ephemeral-bug-group): Allow fetching several bug reports at once.
Diffstat (limited to 'lisp/gnus/pop3.el')
| -rw-r--r-- | lisp/gnus/pop3.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el index b485ac39f60..e29ddb0d44e 100644 --- a/lisp/gnus/pop3.el +++ b/lisp/gnus/pop3.el @@ -307,7 +307,7 @@ Returns the process associated with the connection." (or pop3-stream-type 'network))) :capability-command "CAPA\r\n" :end-of-command "^\\(-ERR\\|+OK \\).*\n" - :end-of-capability "^\\.\r?\n" + :end-of-capability "^\\.\r?\n\\|^-ERR" :success "^\\+OK.*\n" :return-list t :starttls-function |