diff options
| author | Gnus developers <ding@gnus.org> | 2010-10-05 10:46:15 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-10-05 10:46:15 +0000 |
| commit | 562f5ce55c90f66679adc959c8aa9cc4a9bf0c83 (patch) | |
| tree | b233a5d6f5b3c86b091d781c239e8ac944d063f0 | |
| parent | 50cb700cf1e8e62261f4c1cdbdabd24a3c7aafac (diff) | |
| download | emacs-562f5ce55c90f66679adc959c8aa9cc4a9bf0c83.tar.gz | |
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.
| -rw-r--r-- | lisp/gnus/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/gnus/gnus-html.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/shr.el | 3 | ||||
| -rw-r--r-- | lisp/gnus/sieve-manage.el | 7 |
4 files changed, 22 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 9b7832b5cfb..45fcb4a2cf3 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -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) diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el index 3ae3766ed62..bfbdc41e98c 100644 --- a/lisp/gnus/gnus-html.el +++ b/lisp/gnus/gnus-html.el @@ -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) diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el index 59d7b784a1f..f905bf5ac05 100644 --- a/lisp/gnus/shr.el +++ b/lisp/gnus/shr.el @@ -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)) diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el index 0f16444ca39..8749864d81b 100644 --- a/lisp/gnus/sieve-manage.el +++ b/lisp/gnus/sieve-manage.el @@ -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) |