From 3c13704df68536621363a59349d17a306a828c1a Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 19 Oct 2009 13:29:34 +0000 Subject: [PATCH] (Info-complete-menu-item): Use complete-with-action. --- lisp/ChangeLog | 15 +++++++++------ lisp/info.el | 4 +--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 46c27390b57..075c95db279 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,8 +1,12 @@ +2009-10-19 Stefan Monnier + + * info.el (Info-complete-menu-item): Use complete-with-action. + 2009-10-19 Dan Nicolaescu 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 diff --git a/lisp/info.el b/lisp/info.el index db26bbd8b3e..d82d580daab 100644 --- 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) -- 2.39.5