(Info-complete-menu-item): Use complete-with-action.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 46c27390b5765d126c41c3a2292ac8dbb1994e5e..075c95db27993975f69ecd57d66120f8f12bac08 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,12 @@
+2009-10-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * info.el (Info-complete-menu-item): Use complete-with-action.
+
 2009-10-19  Dan Nicolaescu  <dann@ics.uci.edu>
 
        Make vc-annotate work through copies and renames.
-       * vc-annotate.el (vc-annotate-extract-revision-at-line): Return
-       the file name too.
+       * vc-annotate.el (vc-annotate-extract-revision-at-line):
+       Return the file name too.
        (vc-annotate-revision-at-line)
        (vc-annotate-find-revision-at-line)
        (vc-annotate-revision-previous-to-line)
@@ -11,8 +15,8 @@
        (vc-annotate-show-diff-revision-at-line-internal): Change the
        argument to mean whether to show a file diff or not.  Get the file
        name from vc-annotate-extract-revision-at-line.
-       (vc-annotate-show-diff-revision-at-line): Update
-       vc-annotate-show-diff-revision-at-line call.
+       (vc-annotate-show-diff-revision-at-line):
+       Update vc-annotate-show-diff-revision-at-line call.
        (vc-annotate-warp-revision): Add an optional file argument.
 
        * vc-git.el (vc-git-annotate-command): Pass -C -C to the blame command.
@@ -44,8 +48,7 @@
        * emacs-lisp/lisp-mode.el (preceding-sexp): Recognize hash table
        read syntax (Bug#4737).
 
-       * textmodes/sgml-mode.el (sgml-delete-tag): Use
-       sgml-looking-back-at.
+       * textmodes/sgml-mode.el (sgml-delete-tag): Use sgml-looking-back-at.
 
 2009-10-18  Aaron S. Hawley  <aaron.s.hawley@gmail.com>
 

diff --git a/lisp/info.el b/lisp/info.el
index db26bbd8b3e0346ab546f175006ffb3ae8280526..d82d580daab9c99a80f419bf7cb9cac68148ce1f 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2480,9 +2480,7 @@ Because of ambiguities, this should be concatenated with something like
                   (list Info-current-file Info-current-node
                         Info-complete-next-re string completions
                         Info-complete-nodes)))
-           (if action
-               (all-completions string completions predicate)
-             (try-completion string completions predicate))))))))
+            (complete-with-action action completions string predicate)))))))
 
 
 (defun Info-menu (menu-item &optional fork)