Mercurial > emacs
diff lisp/gnus/sieve-manage.el @ 110774:276ecc27ad6b
Merge changes made in Gnus trunk.
sieve-manage.el (sieve-manage-default-stream): Make default stream customizable.
gnus-html.el (gnus-html-wash-tags): Decode URL entities to avoid broken links.
nnimap.el (nnimap-open-connection): Give an error if nnimap-stream is unknown.
shr.el (shr-tag-em): Add <EM> tag.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Tue, 05 Oct 2010 10:46:15 +0000 |
| parents | 8ce8af5eb5e3 |
| children | 6ae391b53988 |
line wrap: on
line diff
--- a/lisp/gnus/sieve-manage.el Tue Oct 05 07:50:08 2010 +0000 +++ b/lisp/gnus/sieve-manage.el Tue Oct 05 10:46:15 2010 +0000 @@ -162,6 +162,12 @@ :type 'integer :group 'sieve-manage) +(defcustom sieve-manage-default-stream 'network + "Default stream type to use for `sieve-manage'. +Must be a name of a stream in `sieve-manage-stream-alist'." + :type 'symbol + :group 'sieve-manage) + ;; Internal variables: (defconst sieve-manage-local-variables '(sieve-manage-server @@ -174,7 +180,6 @@ sieve-manage-client-eol sieve-manage-server-eol sieve-manage-capability)) -(defconst sieve-manage-default-stream 'network) (defconst sieve-manage-coding-system-for-read 'binary) (defconst sieve-manage-coding-system-for-write 'binary) (defvar sieve-manage-stream nil)