summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/ido.el11
2 files changed, 9 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 382c5804330..46e8f62f19b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-09 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * ido.el (ido-completion-help): Fix up compiler warning.
+
2013-08-09 Juanma Barranquero <lekktu@gmail.com>
* frameset.el (frameset-p): Add autoload cookie.
diff --git a/lisp/ido.el b/lisp/ido.el
index 5d017069c5e..39ad3137bc9 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -3972,12 +3972,11 @@ If `ido-change-word-sub' cannot be found in WORD, return nil."
(if (featurep 'xemacs)
;; XEmacs extents are put on by default, doesn't seem to be
;; any way of switching them off.
- ;; This obscure code avoids a byte compiler warning in Emacs.
- (let ((f 'display-completion-list))
- (funcall f completion-list
- :help-string "ido "
- :activate-callback
- (lambda (x y z) (message "Doesn't work yet, sorry!"))))
+ (display-completion-list
+ completion-list
+ :help-string "ido "
+ :activate-callback
+ (lambda (&rest _) (message "Doesn't work yet, sorry!")))
;; else running Emacs
;;(add-hook 'completion-setup-hook 'completion-setup-function)
(display-completion-list completion-list)))))))