Florian Ragwitz' stuff removed because of missing paperwork.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e612c626f9fb6a9dd945b443d73e1bb2f57d4604..32b6716c970a7e5d56cc9f6764fa1c5a9c272c93 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,12 +1,5 @@
 2010-10-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-       * gnus-util.el (gnus-completing-read-function): Exclude
-       gnus-icompleting-read and gnus-ido-completing-read from candidates for
-       XEmacs since iswitchb.el is very old and ido.el is unavailable in
-       XEmacs.
-       (iswitchb-mode, iswitchb-temp-buflist, iswitchb-read-buffer): Silence
-       the byte compiler.
-
        * gravatar.el: Don't load image.el that XEmacs doesn't provide.
        (gravatar-create-image): New function that's an alias to
        gnus-xmas-create-image, gnus-create-image, or create-image.
@@ -143,17 +136,6 @@
        `gnus-faces-properties-alist'.
        Add :version property.
 
-2010-09-28  Florian Ragwitz  <rafl@debian.org>
-
-       * gnus-util.el (gnus-use-ido): Removed.
-       (gnus-std-completing-read): Add wrapper around completing-read.
-       (gnus-icompleting-read): Add wrapper around ibuffer-read-buffer.
-       (gnus-ido-completing-read): Add wrapper around ido-completing-read.
-       (gnus-completing-read-function): Add to chose from the above completion
-       functions or to provide a custom one.
-       (gnus-completing-read): Use the completing-read function configured
-       with gnus-completing-read-function.
-
 2010-09-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mail-source.el (mail-source-report-new-mail)
@@ -317,11 +299,6 @@
        discover we're on a STARTTLS-capable server, then open a STARTTLS
        connection instead.
 
-2010-09-27  Florian Ragwitz  <rafl@debian.org>  (tiny change)
-
-       * sieve-manage.el (sieve-manage-default-stream): Make default stream
-       customizable.
-
 2010-09-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * nnimap.el (utf7): Required.
@@ -342,11 +319,6 @@
 
        * gnus-art.el (gnus-mime-delete-part): Fix Lisp type of byte(s).
 
-2010-09-26  Florian Ragwitz  <rafl@debian.org>  (tiny change)
-
-       * gnus-html.el (gnus-html-wash-tags): Decode URL entities to avoid
-       handing broken links to browse-url.
-
 2010-09-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * nndoc.el (nndoc-request-list): Return success always.

diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index 4bac528196d28ba22f55e1b8ec8ef1aada62457b..587c28e974a84478e320ada34d7b18cee95462f1 100644 (file)
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/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/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 3451cde67308778c15c1cf654e1d9b90d26e1078..d188ebab734a18ecd854fd85312faa339beb254e 100644 (file)
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -44,21 +44,11 @@
     (defmacro with-no-warnings (&rest body)
       `(progn ,@body))))
 
-(defcustom gnus-completing-read-function
-  #'gnus-std-completing-read
-  "Function to do a completing read."
+(defcustom gnus-use-ido nil
+  "Whether to use `ido' for `completing-read'."
+  :version "24.1"
   :group 'gnus-meta
-  :type `(radio (function-item
-                 :doc "Use Emacs' standard `completing-read' function."
-                 gnus-std-completing-read)
-               ,@(unless (featurep 'xemacs)
-                   '((function-item
-                      :doc "Use iswitchb's completing-read function."
-                      gnus-icompleting-read)
-                     (function-item
-                      :doc "Use ido's completing-read function."
-                      gnus-ido-completing-read)))
-                (function)))
+  :type 'boolean)
 
 (defcustom gnus-completion-styles
   (if (and (boundp 'completion-styles-alist)
@@ -1593,55 +1583,19 @@ SPEC is a predicate specifier that contains stuff like `or', `and',
        `(,(car spec) ,@(mapcar 'gnus-make-predicate-1 (cdr spec)))
       (error "Invalid predicate specifier: %s" spec)))))
 
-(defun gnus-std-completing-read (prompt collection &optional require-match
-                                        initial-input history def)
-  (completing-read prompt collection nil require-match
-                   initial-input history def))
-
-(defvar iswitchb-mode)
-(defvar iswitchb-temp-buflist)
-(declare-function iswitchb-read-buffer "iswitchb"
-                 (prompt &optional default require-match start matches-set))
-
-(defun gnus-icompleting-read (prompt collection &optional require-match
-                                     initial-input history def)
-  (require 'iswitchb)
-  (let ((iswitchb-make-buflist-hook
-         (lambda ()
-           (setq iswitchb-temp-buflist
-                 (let ((choices (append (list)
-                                        (when initial-input (list initial-input))
-                                        (symbol-value history) collection))
-                       filtered-choices)
-                   (while choices
-                     (when (and (car choices) (not (member (car choices) filtered-choices)))
-                       (setq filtered-choices (cons (car choices) filtered-choices)))
-                     (setq choices (cdr choices)))
-                   (nreverse filtered-choices))))))
-    (unwind-protect
-        (progn
-          (when (not iswitchb-mode)
-            (add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup))
-          (iswitchb-read-buffer prompt def require-match))
-      (when (not iswitchb-mode)
-        (remove-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup)))))
-
-(defun gnus-ido-completing-read (prompt collection &optional require-match
-                                        initial-input history def)
-  (require 'ido)
-  (ido-completing-read prompt collection nil require-match
-                       initial-input history def))
-
 (defun gnus-completing-read (prompt collection &optional require-match
                                     initial-input history def)
-  "Do a completing read with the configured `gnus-completing-read-function'."
+  "Call `completing-read' or `ido-completing-read'.
+Depends on `gnus-use-ido'."
   (let ((completion-styles gnus-completion-styles))
     (funcall
-     gnus-completing-read-function
+     (if gnus-use-ido
+         'ido-completing-read
+       'completing-read)
      (concat prompt (when def
                       (concat " (default " def ")"))
              ": ")
-     collection require-match initial-input history def)))
+     collection nil require-match initial-input history def)))
 
 (defun gnus-graphic-display-p ()
   (if (featurep 'xemacs)

diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el
index 8749864d81b26774ea797ca9565d9f9aab7598c6..0f16444ca39aa60f2fcb8180be66004f9b48eb6d 100644 (file)
--- a/lisp/gnus/sieve-manage.el
+++ b/lisp/gnus/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)