From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/72373 Path: news.gmane.org!not-for-mail From: Florian Ragwitz Newsgroups: gmane.emacs.gnus.general Subject: Re: [PATCH] Introduce gnus-completing-read Date: Fri, 01 Oct 2010 03:01:24 +0200 Message-ID: <877hi2u3ob.fsf@tardis.home.perldition.org> References: <1285688153-19680-1-git-send-email-julien@danjou.info> <87eicdacn6.fsf@tardis.home.perldition.org> <87hbh9tx2x.fsf@keller.adm.naquadah.org> <87y6aj7mp2.fsf@marauder.physik.uni-ulm.de> <87y6aj4jjk.fsf@tardis.home.perldition.org> <87hbh74gb5.fsf@tardis.home.perldition.org> <87d3rv4fvz.fsf@tardis.home.perldition.org> <87sk0r2xzc.fsf@tardis.home.perldition.org> <87pqvv6utx.fsf@lifelogs.com> <878w2j6tp0.fsf@lifelogs.com> <87k4m3ywm5.fsf@tardis.home.perldition.org> <87eicbyvqs.fsf@tardis.home.perldition.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" X-Trace: dough.gmane.org 1285894944 29867 80.91.229.12 (1 Oct 2010 01:02:24 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 1 Oct 2010 01:02:24 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M20746@lists.math.uh.edu Fri Oct 01 03:02:23 2010 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1P1U11-0001yZ-3Z for ding-account@gmane.org; Fri, 01 Oct 2010 03:02:23 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1P1U0y-0000qW-SH; Thu, 30 Sep 2010 20:02:20 -0500 Original-Received: from mx1.math.uh.edu ([129.7.128.32]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1P1U0w-0000qC-Jz for ding@lists.math.uh.edu; Thu, 30 Sep 2010 20:02:18 -0500 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx1.math.uh.edu with esmtp (Exim 4.72) (envelope-from ) id 1P1U0r-0002QT-UO for ding@lists.math.uh.edu; Thu, 30 Sep 2010 20:02:18 -0500 Original-Received: from kief.perldition.org ([78.47.20.161]) by quimby.gnus.org with esmtp (Exim 3.36 #1 (Debian)) id 1P1U0r-0008EY-00 for ; Fri, 01 Oct 2010 03:02:13 +0200 Original-Received: from p4fd7608c.dip.t-dialin.net ([79.215.96.140] helo=tardis.home.perldition.org) by kief.perldition.org with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1P1U0o-0001Yr-As for ding@gnus.org; Fri, 01 Oct 2010 03:02:12 +0200 Original-Received: from rafl by tardis.home.perldition.org with local (Exim 4.72) (envelope-from ) id 1P1U07-0007lY-Of for ding@gnus.org; Fri, 01 Oct 2010 03:01:27 +0200 Mail-Copies-To: never In-Reply-To: (Lars Magne Ingebrigtsen's message of "Thu, 30 Sep 2010 19:49:21 +0200") User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/23.2 (gnu/linux) X-Spam_score: -3.9 X-Spam_score_int: -38 X-Spam_bar: --- X-Spam_report: Spam detection software, running on the system "kief.perldition.org", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Lars Magne Ingebrigtsen writes: > Florian Ragwitz writes: > >> If I made such a patch, which I'll be happy to do, will you be allowed >> to apply it? > > Yes. :-) Here it is. [...] Content analysis details: (-3.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.8 ALL_TRUSTED Passed through trusted hosts only via SMTP -2.6 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [s X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:72373 Archived-At: --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Lars Magne Ingebrigtsen writes: > Florian Ragwitz writes: > >> If I made such a patch, which I'll be happy to do, will you be allowed >> to apply it? > > Yes. :-) Here it is. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Revert-changes-by-Florian-Ragwitz.patch Content-Transfer-Encoding: quoted-printable Content-Description: Revert changes by Florian Ragwitz From=204f911174b2956ee532502a6139cb0d450a3564ef Mon Sep 17 00:00:00 2001 From: Florian Ragwitz Date: Fri, 1 Oct 2010 02:48:42 +0200 Subject: [PATCH] Revert changes by Florian Ragwitz He didn't do the required paperwork. This reverts the commits 7dc2bb6839a47d8054c732b607e8affca0e9fc68, "Decode URL entities to avoid broken links" fc8a05bb16b15558e896c1723684aa5e0b8d06c9, "(sieve-manage-default-stream): Make default stream customizable." defbfad6913b5077f97df1382534d5b48edbd5b8, "Add requires and fix history for iswitchb" and 29395112826e19380dccb5270c7b5f3b471ecaa9. "Make completing-read function configurable" Conflicts: lisp/ChangeLog =2D-- lisp/ChangeLog | 29 +++++++++++++++++++++++++ lisp/gnus-html.el | 2 +- lisp/gnus-util.el | 58 ++++++++--------------------------------------= --- lisp/sieve-manage.el | 7 +----- 4 files changed, 41 insertions(+), 55 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1772fff..a68ee07 100644 =2D-- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,32 @@ +2010-10-01 Florian Ragwitz + + * gnus-util.el (gnus-use-ido): Revert "Removed." due to missing + paperwork. + (gnus-std-completing-read): Revert "Add wrapper around + completing-read." due to missing paperwork. + (gnus-icompleting-read): Revert "Add wrapper around + ibuffer-read-buffer." due to missing paperwork. + (gnus-ido-completing-read): Revert "Add wrapper around + ido-completing-read." due to missing paperwork. + (gnus-completing-read-function): Revert "Add to chose from the above + completion functions or to provide a custom one." due to missing + paperwork. + (gnus-completing-read): Revert "Use the completing-read function + configured with gnus-completing-read-function." due to missing + paperwork. + + * gnus-util.el (gnus-icompleting-read): Revert "Require iswitchb. Fix + history computing." which was depending on a patch with missing + paperwork. + (gnus-ido-completing-read): Revert "Require ido." which was depending + on a patch with missing paperwork. + + * sieve-manage.el (sieve-manage-default-stream): Revert "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 Teodor Zlatanov =20 * gnus-registry.el (gnus-registry-install-nnregistry): New function to diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el index 4bac528..587c28e 100644 =2D-- 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 =2D '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-util.el b/lisp/gnus-util.el index 2f9bdd6..d188eba 100644 =2D-- a/lisp/gnus-util.el +++ b/lisp/gnus-util.el @@ -44,18 +44,11 @@ (defmacro with-no-warnings (&rest body) `(progn ,@body)))) =20 =2D(defcustom gnus-completing-read-function =2D #'gnus-std-completing-read =2D "Function to do a completing read." +(defcustom gnus-use-ido nil + "Whether to use `ido' for `completing-read'." + :version "24.1" :group 'gnus-meta =2D :type '(radio (function-item =2D :doc "Use Emacs' standard `completing-read' function." =2D gnus-std-completing-read) =2D (function-item :doc "Use iswitchb's completing-read func= tion." =2D gnus-icompleting-read) =2D (function-item :doc "Use ido's completing-read function." =2D gnus-ido-completing-read) =2D (function))) + :type 'boolean) =20 (defcustom gnus-completion-styles (if (and (boundp 'completion-styles-alist) @@ -1590,50 +1583,19 @@ SPEC is a predicate specifier that contains stuff l= ike `or', `and', `(,(car spec) ,@(mapcar 'gnus-make-predicate-1 (cdr spec))) (error "Invalid predicate specifier: %s" spec))))) =20 =2D(defun gnus-std-completing-read (prompt collection &optional require-mat= ch =2D initial-input history def) =2D (completing-read prompt collection nil require-match =2D initial-input history def)) =2D =2D(defun gnus-icompleting-read (prompt collection &optional require-match =2D initial-input history def) =2D (require 'iswitchb) =2D (let ((iswitchb-make-buflist-hook =2D (lambda () =2D (setq iswitchb-temp-buflist =2D (let ((choices (append (list) =2D (when initial-input (list initia= l-input)) =2D (symbol-value history) collectio= n)) =2D filtered-choices) =2D (while choices =2D (when (and (car choices) (not (member (car choices)= filtered-choices))) =2D (setq filtered-choices (cons (car choices) filter= ed-choices))) =2D (setq choices (cdr choices))) =2D (nreverse filtered-choices)))))) =2D (unwind-protect =2D (progn =2D (when (not iswitchb-mode) =2D (add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup)) =2D (iswitchb-read-buffer prompt def require-match)) =2D (when (not iswitchb-mode) =2D (remove-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup))= ))) =2D =2D(defun gnus-ido-completing-read (prompt collection &optional require-mat= ch =2D initial-input history def) =2D (require 'ido) =2D (ido-completing-read prompt collection nil require-match =2D initial-input history def)) =2D (defun gnus-completing-read (prompt collection &optional require-match initial-input history def) =2D "Do a completing read with the configured `gnus-completing-read-functi= on'." + "Call `completing-read' or `ido-completing-read'. +Depends on `gnus-use-ido'." (let ((completion-styles gnus-completion-styles)) (funcall =2D gnus-completing-read-function + (if gnus-use-ido + 'ido-completing-read + 'completing-read) (concat prompt (when def (concat " (default " def ")")) ": ") =2D collection require-match initial-input history def))) + collection nil require-match initial-input history def))) =20 (defun gnus-graphic-display-p () (if (featurep 'xemacs) diff --git a/lisp/sieve-manage.el b/lisp/sieve-manage.el index 8749864..0f16444 100644 =2D-- a/lisp/sieve-manage.el +++ b/lisp/sieve-manage.el @@ -162,12 +162,6 @@ for doing the actual authentication." :type 'integer :group 'sieve-manage) =20 =2D(defcustom sieve-manage-default-stream 'network =2D "Default stream type to use for `sieve-manage'. =2DMust be a name of a stream in `sieve-manage-stream-alist'." =2D :type 'symbol =2D :group 'sieve-manage) =2D ;; Internal variables: =20 (defconst sieve-manage-local-variables '(sieve-manage-server @@ -180,6 +174,7 @@ Must be a name of a stream in `sieve-manage-stream-alis= t'." 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) =2D-=20 1.7.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkylMuUACgkQdC8qQo5jWl6AhACfe/94aTF3zBEuqlm6uUZ6S908 ncsAn3v4RF5Ib4kp04GI0aGtEQfQAvKn =xB3q -----END PGP SIGNATURE----- --==-=-=--