Commit 562f5ce5 authored by Gnus developers's avatar Gnus developers Committed by Katsumi Yamaoka
Browse files

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.
parent 50cb700c
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)
......
......@@ -282,7 +282,7 @@ Use ALT-TEXT for the image string."
(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)
......
......@@ -125,6 +125,9 @@ fit these criteria."
(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))
......
......@@ -162,6 +162,12 @@ for doing the actual authentication."
: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 @@ for doing the actual authentication."
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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment