From: Florian Ragwitz <rafl@debian.org>
To: ding@gnus.org
Subject: Re: [PATCH] Introduce gnus-completing-read
Date: Fri, 01 Oct 2010 03:01:24 +0200 [thread overview]
Message-ID: <877hi2u3ob.fsf@tardis.home.perldition.org> (raw)
In-Reply-To: <m38w2jglzy.fsf@quimbies.gnus.org> (Lars Magne Ingebrigtsen's message of "Thu, 30 Sep 2010 19:49:21 +0200")
[-- Attachment #1.1: Type: text/plain, Size: 214 bytes --]
Lars Magne Ingebrigtsen <larsi@gnus.org> writes:
> Florian Ragwitz <rafl@debian.org> 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.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: Revert changes by Florian Ragwitz --]
[-- Type: text/x-diff, Size: 7777 bytes --]
From 4f911174b2956ee532502a6139cb0d450a3564ef Mon Sep 17 00:00:00 2001
From: Florian Ragwitz <rafl@debian.org>
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
---
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
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,32 @@
+2010-10-01 Florian Ragwitz <rafl@debian.org>
+
+ * 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 <tzz@lifelogs.com>
* 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
--- 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/gnus-util.el b/lisp/gnus-util.el
index 2f9bdd6..d188eba 100644
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -44,18 +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)
- (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)
@@ -1590,50 +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))
-
-(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/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
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2010-10-01 1:01 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-28 15:35 Julien Danjou
2010-09-28 15:49 ` Eric Abrahamsen
2010-09-28 15:55 ` Florian Ragwitz
2010-09-28 16:04 ` Julien Danjou
2010-09-28 19:31 ` Florian Ragwitz
2010-09-28 20:47 ` Julien Danjou
2010-09-29 15:19 ` Lars Magne Ingebrigtsen
2010-09-29 21:47 ` Lars Magne Ingebrigtsen
2010-09-30 8:05 ` Julien Danjou
2010-09-30 9:42 ` Robert Pluim
2010-09-30 9:56 ` Julien Danjou
2010-09-30 6:46 ` Reiner Steib
2010-09-30 10:23 ` Florian Ragwitz
2010-09-30 10:44 ` Lars Magne Ingebrigtsen
2010-09-30 11:33 ` Florian Ragwitz
2010-09-30 11:36 ` Lars Magne Ingebrigtsen
2010-09-30 11:42 ` Florian Ragwitz
2010-09-30 12:20 ` Julien Danjou
2010-09-30 12:54 ` Florian Ragwitz
2010-09-30 13:29 ` Julien Danjou
2010-09-30 16:33 ` Lars Magne Ingebrigtsen
2010-09-30 16:48 ` Ted Zlatanov
2010-09-30 16:55 ` Lars Magne Ingebrigtsen
2010-09-30 17:13 ` Ted Zlatanov
2010-09-30 17:22 ` Florian Ragwitz
2010-09-30 17:39 ` Lars Magne Ingebrigtsen
2010-09-30 17:41 ` Florian Ragwitz
2010-09-30 17:49 ` Lars Magne Ingebrigtsen
2010-10-01 1:01 ` Florian Ragwitz [this message]
2010-10-01 9:43 ` Lars Magne Ingebrigtsen
2010-10-01 10:13 ` Lars Magne Ingebrigtsen
2010-09-30 17:47 ` Ted Zlatanov
2010-10-01 9:00 ` Julien Danjou
2010-09-30 17:06 ` Florian Ragwitz
2010-10-01 6:17 ` Copyright assignments, policies, conventions (was: [PATCH] Introduce gnus-completing-read) Reiner Steib
2010-10-01 13:51 ` Copyright assignments, policies, conventions Štěpán Němec
2010-09-30 12:13 ` [PATCH] Introduce gnus-completing-read Štěpán Němec
2010-09-28 15:55 ` Dan Christensen
2010-09-28 16:00 ` Julien Danjou
2010-09-28 16:02 ` Julien Danjou
2010-09-28 20:07 ` Ted Zlatanov
2010-09-28 20:36 ` Julien Danjou
2010-09-28 21:08 ` Ted Zlatanov
2010-10-01 15:57 ` Matt Lundin
2010-10-01 18:21 ` Lars Magne Ingebrigtsen
2010-10-01 23:45 ` Matt Lundin
2010-10-02 2:21 ` Lars Magne Ingebrigtsen
2010-10-02 17:48 ` Matt Lundin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877hi2u3ob.fsf@tardis.home.perldition.org \
--to=rafl@debian.org \
--cc=ding@gnus.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).