[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101699: gnus-util.el (gnus-completin
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101699: gnus-util.el (gnus-completing-read-function): Exclude gnus-icompleting-read and gnus-ido-completing-read from candidates for XEmacs. |
Date: |
Fri, 01 Oct 2010 06:56:38 +0000 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101699
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2010-10-01 06:56:38 +0000
message:
gnus-util.el (gnus-completing-read-function): Exclude gnus-icompleting-read
and gnus-ido-completing-read from candidates for XEmacs.
Silence the byte compiler.
modified:
lisp/gnus/ChangeLog
lisp/gnus/gnus-util.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2010-10-01 05:50:11 +0000
+++ b/lisp/gnus/ChangeLog 2010-10-01 06:56:38 +0000
@@ -1,5 +1,12 @@
2010-10-01 Katsumi Yamaoka <address@hidden>
+ * 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.
=== modified file 'lisp/gnus/gnus-util.el'
--- a/lisp/gnus/gnus-util.el 2010-09-30 08:39:23 +0000
+++ b/lisp/gnus/gnus-util.el 2010-10-01 06:56:38 +0000
@@ -48,13 +48,16 @@
#'gnus-std-completing-read
"Function to do a completing read."
:group 'gnus-meta
- :type '(radio (function-item
+ :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)
+ ,@(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
@@ -1595,6 +1598,11 @@
(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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101699: gnus-util.el (gnus-completing-read-function): Exclude gnus-icompleting-read and gnus-ido-completing-read from candidates for XEmacs.,
Katsumi Yamaoka <=