2 files changed, 20 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a8e111cb2ed..cdd1822303d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-31  Sean O'Rourke  <sorourke@cs.ucsd.edu>
+
+        * emacs-lisp/find-func.el (find-library): use library at
+        point as default interactive argument.
+
 2007-10-31  Juanma Barranquero  <lekktu@gmail.com>
 
         * shadowfile.el (shadow-join): Remove.
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 20b91b10547..b3c7c339030 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -192,11 +192,21 @@ TYPE should be nil to find a function, or `defvar' to find a variable."
 (defun find-library (library)
   "Find the elisp source of LIBRARY."
   (interactive
-   (list
-    (completing-read "Library name: "
-                     'locate-file-completion
-                     (cons (or find-function-source-path load-path)
-                           (find-library-suffixes)))))
+   (let* ((path (cons (or find-function-source-path load-path)
+                      (find-library-suffixes)))
+          (def (if (eq (function-called-at-point) 'require)
+                   (save-excursion
+                     (backward-up-list)
+                     (forward-char)
+                     (backward-sexp -2)
+                     (thing-at-point 'symbol))
+                 (thing-at-point 'symbol))))
+     (when def
+       (setq def (and (locate-file-completion def path 'test) def)))
+     (list
+      (completing-read (if def (format "Library name (default %s): " def)
+                         "Library name: ")
+                       'locate-file-completion path 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)))))