aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier2013-08-08 20:54:22 -0400
committerStefan Monnier2013-08-08 20:54:22 -0400
commitad9dcd70d619c92ba664c87eead897567b9f1691 (patch)
treeb5239fba0b89c409550a11152540b98f1e4f7657 /lisp
parent241de2901eb3660565acbe5469e3179fce43e225 (diff)
downloademacs-ad9dcd70d619c92ba664c87eead897567b9f1691.tar.gz
emacs-ad9dcd70d619c92ba664c87eead897567b9f1691.zip
* lisp/ido.el (ido-completion-help): Fix up compiler warning.
Diffstat (limited to 'lisp')
-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 @@
12013-08-09 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * ido.el (ido-completion-help): Fix up compiler warning.
4
12013-08-09 Juanma Barranquero <lekktu@gmail.com> 52013-08-09 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * frameset.el (frameset-p): Add autoload cookie. 7 * 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."
3972 (if (featurep 'xemacs) 3972 (if (featurep 'xemacs)
3973 ;; XEmacs extents are put on by default, doesn't seem to be 3973 ;; XEmacs extents are put on by default, doesn't seem to be
3974 ;; any way of switching them off. 3974 ;; any way of switching them off.
3975 ;; This obscure code avoids a byte compiler warning in Emacs. 3975 (display-completion-list
3976 (let ((f 'display-completion-list)) 3976 completion-list
3977 (funcall f completion-list 3977 :help-string "ido "
3978 :help-string "ido " 3978 :activate-callback
3979 :activate-callback 3979 (lambda (&rest _) (message "Doesn't work yet, sorry!")))
3980 (lambda (x y z) (message "Doesn't work yet, sorry!"))))
3981 ;; else running Emacs 3980 ;; else running Emacs
3982 ;;(add-hook 'completion-setup-hook 'completion-setup-function) 3981 ;;(add-hook 'completion-setup-hook 'completion-setup-function)
3983 (display-completion-list completion-list))))))) 3982 (display-completion-list completion-list)))))))