# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1255958974 0
# Node ID 6220a5eef4ef475cc85f10129dded22a12ae1081
# Parent  71532400320417baeccb37772921d8e19f3623dc
(Info-complete-menu-item): Use complete-with-action.

diff -r 715324003204 -r 6220a5eef4ef lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Oct 19 05:13:31 2009 +0000
+++ b/lisp/ChangeLog	Mon Oct 19 13:29:34 2009 +0000
@@ -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 -r 715324003204 -r 6220a5eef4ef lisp/info.el
--- a/lisp/info.el	Mon Oct 19 05:13:31 2009 +0000
+++ b/lisp/info.el	Mon Oct 19 13:29:34 2009 +0000
@@ -2480,9 +2480,7 @@
 		   (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)