From 1d0a5d5ef8b28179b52211ebf93c2b3af27a3ebe Mon Sep 17 00:00:00 2001 From: Florian Ragwitz Date: Thu, 30 Sep 2010 13:27:17 +0200 Subject: [PATCH] Revert changes by Florian Ragwitz He didn't do the require paperwork. This reverts the commits fc8a05bb16b15558e896c1723684aa5e0b8d06c9. "(sieve-manage-default-stream): Make default stream customizable." and 7dc2bb6839a47d8054c732b607e8affca0e9fc68. "Decode URL entities to avoid broken links" Conflicts: lisp/ChangeLog --- lisp/ChangeLog | 9 +++++++++ lisp/gnus-html.el | 2 +- lisp/sieve-manage.el | 7 +------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b936ea1..76d7745 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2010-09-30 Florian Ragwitz + + * sieve-manage.el (sieve-manage-default-stream): Revert + "(sieve-manage-default-stream): Make default stream customizable." due + to missing paperwork. + + * gnus-html.el (gnus-html-wash-tags): Revert "Decode URL entities to + avoid handing broken links to browse-url" due to missing paperwork. + 2010-09-30 Julien Danjou * gnus-agent.el (gnus-agent-add-group): Fix call to diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el index 4bac528..587c28e 100644 --- a/lisp/gnus-html.el +++ b/lisp/gnus-html.el @@ -286,7 +286,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 (mm-url-decode-entities-string url) + 'browse-url url url) (let ((overlay (gnus-make-overlay start end))) (gnus-overlay-put overlay 'evaporate t) diff --git a/lisp/sieve-manage.el b/lisp/sieve-manage.el index 8749864..0f16444 100644 --- a/lisp/sieve-manage.el +++ b/lisp/sieve-manage.el @@ -162,12 +162,6 @@ 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 @@ -180,6 +174,7 @@ Must be a name of a stream in `sieve-manage-stream-alist'." 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) -- 1.7.1