From 7c23d9e85b58d0cc360c255ff86bd3e723259d7f Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 21 Oct 2010 23:17:26 -0400 Subject: [PATCH] * lisp/emacs-lisp/find-func.el (find-library): Use test-completion. --- lisp/ChangeLog | 15 +++++++++------ lisp/emacs-lisp/find-func.el | 12 +++++------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3e29cf4a01f..4312c06dd05 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,10 @@ +2010-10-22 Stefan Monnier + + * emacs-lisp/find-func.el (find-library): Use test-completion. + 2010-10-21 Lars Magne Ingebrigtsen - * newcomment.el (comment-dwim): Fix the intentation in the doc - string. + * newcomment.el (comment-dwim): Fix the intentation in the doc string. 010-10-21 Michael Albinus @@ -13,15 +16,15 @@ 2010-10-21 Daiki Ueno - * hexl.el (hexl-mode, hexl-mode-exit): Tweak - revert-buffer-function to inhibit auto-mode-alist (Bug#7252). + * hexl.el (hexl-mode, hexl-mode-exit): + Tweak revert-buffer-function to inhibit auto-mode-alist (Bug#7252). (hexl-revert-buffer-function): New function. (hexl-before-revert-hook, hexl-after-revert-hook): Abolish. 2010-10-19 Alan Mackenzie - * progmodes/cc-langs.el (c-type-decl-prefix-key): C++ bit: move - "\(const\|throw\|volatile\)\>" nearer the start of the regexp, so + * progmodes/cc-langs.el (c-type-decl-prefix-key): C++ bit: + Move "\(const\|throw\|volatile\)\>" nearer the start of the regexp, so that these keywords aren't wrongly matched as identifiers. * progmodes/cc-mode.el (c-before-change, c-after-change): Move the diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el index 216d91baa7b..9d59337a7c7 100644 --- a/lisp/emacs-lisp/find-func.el +++ b/lisp/emacs-lisp/find-func.el @@ -213,6 +213,8 @@ LIBRARY should be a string (the name of the library)." (interactive (let* ((dirs (or find-function-source-path load-path)) (suffixes (find-library-suffixes)) + (table (apply-partially 'locate-file-completion-table + dirs suffixes)) (def (if (eq (function-called-at-point) 'require) ;; `function-called-at-point' may return 'require ;; with `point' anywhere on this line. So wrap the @@ -226,16 +228,12 @@ LIBRARY should be a string (the name of the library)." (thing-at-point 'symbol)) (error nil)) (thing-at-point 'symbol)))) - (when def - (setq def (and (locate-file-completion-table - dirs suffixes def nil 'lambda) - def))) + (when (and def (not (test-completion def table))) + (setq def nil)) (list (completing-read (if def (format "Library name (default %s): " def) "Library name: ") - (apply-partially 'locate-file-completion-table - dirs suffixes) - nil nil nil nil def)))) + table nil nil nil nil def)))) (let ((buf (find-file-noselect (find-library-name library)))) (condition-case nil (switch-to-buffer buf) (error (pop-to-buffer buf))))) -- 2.39.5