Mercurial > emacs
changeset 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 | 22b487462b5a |
| children | 6ae391b53988 |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-html.el lisp/gnus/shr.el lisp/gnus/sieve-manage.el |
| diffstat | 4 files changed, 22 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Tue Oct 05 07:50:08 2010 +0000 +++ b/lisp/gnus/ChangeLog Tue Oct 05 10:46:15 2010 +0000 @@ -1,3 +1,15 @@ +2010-10-05 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * shr.el (shr-tag-em): Add <EM> tag. + +2010-10-05 Florian Ragwitz <rafl@debian.org> (tiny change) + + * sieve-manage.el (sieve-manage-default-stream): Make default stream + customizable. + + * gnus-html.el (gnus-html-wash-tags): Decode URL entities to avoid + handing broken links to browse-url. + 2010-10-05 Julien Danjou <julien@danjou.info> * gnus-util.el (gnus-emacs-completing-read)
--- a/lisp/gnus/gnus-html.el Tue Oct 05 07:50:08 2010 +0000 +++ b/lisp/gnus/gnus-html.el Tue Oct 05 10:46:15 2010 +0000 @@ -282,7 +282,7 @@ (setq url (match-string 1 parameters)) (gnus-message 8 "gnus-html-wash-tags: fetching link URL %s" url) (gnus-article-add-button start end - 'browse-url url + 'browse-url (mm-url-decode-entities-string url) url) (let ((overlay (gnus-make-overlay start end))) (gnus-overlay-put overlay 'evaporate t)
--- a/lisp/gnus/shr.el Tue Oct 05 07:50:08 2010 +0000 +++ b/lisp/gnus/shr.el Tue Oct 05 10:46:15 2010 +0000 @@ -125,6 +125,9 @@ (defun shr-tag-i (cont) (shr-fontize-cont cont 'italic)) +(defun shr-tag-em (cont) + (shr-fontize-cont cont 'bold)) + (defun shr-tag-u (cont) (shr-fontize-cont cont 'underline))
--- 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)