[Emacs-diffs] /srv/bzr/emacs/trunk r101802: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101802
author: Gnus developers
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2010-10-05 10:46:15 +0000
message:
  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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-html.el
  lisp/gnus/shr.el
  lisp/gnus/sieve-manage.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-05 07:50:08 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-05 10:46:15 +0000
@@ -1,3 +1,15 @@
+2010-10-05  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * shr.el (shr-tag-em): Add <EM> tag.
+
+2010-10-05  Florian Ragwitz  <address@hidden>  (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  <address@hidden>
 
        * gnus-util.el (gnus-emacs-completing-read)

=== modified file 'lisp/gnus/gnus-html.el'
--- a/lisp/gnus/gnus-html.el    2010-10-05 03:48:30 +0000
+++ b/lisp/gnus/gnus-html.el    2010-10-05 10:46:15 +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)

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2010-10-05 01:23:11 +0000
+++ b/lisp/gnus/shr.el  2010-10-05 10:46:15 +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))
 

=== modified file 'lisp/gnus/sieve-manage.el'
--- a/lisp/gnus/sieve-manage.el 2010-10-01 11:15:10 +0000
+++ b/lisp/gnus/sieve-manage.el 2010-10-05 10:46:15 +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)