Commit 967f57dc authored by Lars Magne Ingebrigtsen's avatar Lars Magne Ingebrigtsen Committed by Katsumi Yamaoka
Browse files

Florian Ragwitz' stuff removed because of missing paperwork.

parent 19d5deef
2010-10-01 Katsumi Yamaoka <yamaoka@jpl.org> 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.el: Don't load image.el that XEmacs doesn't provide.
(gravatar-create-image): New function that's an alias to (gravatar-create-image): New function that's an alias to
gnus-xmas-create-image, gnus-create-image, or create-image. gnus-xmas-create-image, gnus-create-image, or create-image.
...@@ -143,17 +136,6 @@ ...@@ -143,17 +136,6 @@
`gnus-faces-properties-alist'. `gnus-faces-properties-alist'.
Add :version property. 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> 2010-09-28 Katsumi Yamaoka <yamaoka@jpl.org>
   
* mail-source.el (mail-source-report-new-mail) * mail-source.el (mail-source-report-new-mail)
...@@ -317,11 +299,6 @@ ...@@ -317,11 +299,6 @@
discover we're on a STARTTLS-capable server, then open a STARTTLS discover we're on a STARTTLS-capable server, then open a STARTTLS
connection instead. 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> 2010-09-27 Lars Magne Ingebrigtsen <larsi@gnus.org>
   
* nnimap.el (utf7): Required. * nnimap.el (utf7): Required.
...@@ -342,11 +319,6 @@ ...@@ -342,11 +319,6 @@
   
* gnus-art.el (gnus-mime-delete-part): Fix Lisp type of byte(s). * 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> 2010-09-26 Lars Magne Ingebrigtsen <larsi@gnus.org>
   
* nndoc.el (nndoc-request-list): Return success always. * nndoc.el (nndoc-request-list): Return success always.
......
...@@ -286,7 +286,7 @@ Use ALT-TEXT for the image string." ...@@ -286,7 +286,7 @@ Use ALT-TEXT for the image string."
(setq url (match-string 1 parameters)) (setq url (match-string 1 parameters))
(gnus-message 8 "gnus-html-wash-tags: fetching link URL %s" url) (gnus-message 8 "gnus-html-wash-tags: fetching link URL %s" url)
(gnus-article-add-button start end (gnus-article-add-button start end
'browse-url (mm-url-decode-entities-string url) 'browse-url url
url) url)
(let ((overlay (gnus-make-overlay start end))) (let ((overlay (gnus-make-overlay start end)))
(gnus-overlay-put overlay 'evaporate t) (gnus-overlay-put overlay 'evaporate t)
......
...@@ -44,21 +44,11 @@ ...@@ -44,21 +44,11 @@
(defmacro with-no-warnings (&rest body) (defmacro with-no-warnings (&rest body)
`(progn ,@body)))) `(progn ,@body))))
(defcustom gnus-completing-read-function (defcustom gnus-use-ido nil
#'gnus-std-completing-read "Whether to use `ido' for `completing-read'."
"Function to do a completing read." :version "24.1"
:group 'gnus-meta :group 'gnus-meta
:type `(radio (function-item :type 'boolean)
: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)))
(defcustom gnus-completion-styles (defcustom gnus-completion-styles
(if (and (boundp 'completion-styles-alist) (if (and (boundp 'completion-styles-alist)
...@@ -1593,55 +1583,19 @@ SPEC is a predicate specifier that contains stuff like `or', `and', ...@@ -1593,55 +1583,19 @@ SPEC is a predicate specifier that contains stuff like `or', `and',
`(,(car spec) ,@(mapcar 'gnus-make-predicate-1 (cdr spec))) `(,(car spec) ,@(mapcar 'gnus-make-predicate-1 (cdr spec)))
(error "Invalid predicate specifier: %s" 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 (defun gnus-completing-read (prompt collection &optional require-match
initial-input history def) 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)) (let ((completion-styles gnus-completion-styles))
(funcall (funcall
gnus-completing-read-function (if gnus-use-ido
'ido-completing-read
'completing-read)
(concat prompt (when def (concat prompt (when def
(concat " (default " def ")")) (concat " (default " def ")"))
": ") ": ")
collection require-match initial-input history def))) collection nil require-match initial-input history def)))
(defun gnus-graphic-display-p () (defun gnus-graphic-display-p ()
(if (featurep 'xemacs) (if (featurep 'xemacs)
......
...@@ -162,12 +162,6 @@ for doing the actual authentication." ...@@ -162,12 +162,6 @@ for doing the actual authentication."
:type 'integer :type 'integer
:group 'sieve-manage) :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: ;; Internal variables:
(defconst sieve-manage-local-variables '(sieve-manage-server (defconst sieve-manage-local-variables '(sieve-manage-server
...@@ -180,6 +174,7 @@ Must be a name of a stream in `sieve-manage-stream-alist'." ...@@ -180,6 +174,7 @@ Must be a name of a stream in `sieve-manage-stream-alist'."
sieve-manage-client-eol sieve-manage-client-eol
sieve-manage-server-eol sieve-manage-server-eol
sieve-manage-capability)) sieve-manage-capability))
(defconst sieve-manage-default-stream 'network)
(defconst sieve-manage-coding-system-for-read 'binary) (defconst sieve-manage-coding-system-for-read 'binary)
(defconst sieve-manage-coding-system-for-write 'binary) (defconst sieve-manage-coding-system-for-write 'binary)
(defvar sieve-manage-stream nil) (defvar sieve-manage-stream nil)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment