# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1287717446 14400
# Node ID 8c55e138333b43841770422babcf5b7343888210
# Parent  9a8bf31cd3078d1451b262d8d1e388ed2bf3edb9
* lisp/emacs-lisp/find-func.el (find-library): Use test-completion.

diff -r 9a8bf31cd307 -r 8c55e138333b lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Oct 22 01:39:13 2010 +0000
+++ b/lisp/ChangeLog	Thu Oct 21 23:17:26 2010 -0400
@@ -1,7 +1,10 @@
+2010-10-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emacs-lisp/find-func.el (find-library): Use test-completion.
+
 2010-10-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-	* 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  <michael.albinus@gmx.de>
 
@@ -13,15 +16,15 @@
 
 2010-10-21  Daiki Ueno  <ueno@unixuser.org>
 
-	* 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  <acm@muc.de>
 
-	* 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 -r 9a8bf31cd307 -r 8c55e138333b lisp/emacs-lisp/find-func.el
--- a/lisp/emacs-lisp/find-func.el	Fri Oct 22 01:39:13 2010 +0000
+++ b/lisp/emacs-lisp/find-func.el	Thu Oct 21 23:17:26 2010 -0400
@@ -213,6 +213,8 @@
   (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 @@
 			 (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)))))