# HG changeset patch
# User Martin Rudalics <rudalics@gmx.at>
# Date 1201283186 0
# Node ID 08990d4db481a70f856bf748f26939062cce373f
# Parent  55f91384380f975873a422bf35b9395e57b30ffc
(find-library): Wrap search for library name in condition-case
to avoid reporting a scan-error.

diff -r 55f91384380f -r 08990d4db481 lisp/emacs-lisp/find-func.el
--- a/lisp/emacs-lisp/find-func.el	Fri Jan 25 15:52:08 2008 +0000
+++ b/lisp/emacs-lisp/find-func.el	Fri Jan 25 17:46:26 2008 +0000
@@ -200,11 +200,17 @@
    (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))
+		   ;; `function-called-at-point' may return 'require
+		   ;; with `point' anywhere on this line.  So wrap the
+		   ;; `save-excursion' below in a `condition-case' to
+		   ;; avoid reporting a scan-error here.
+		   (condition-case nil
+		       (save-excursion
+			 (backward-up-list)
+			 (forward-char)
+			 (forward-sexp 2)
+			 (thing-at-point 'symbol))
+		     (error nil))
 		 (thing-at-point 'symbol))))
      (when def
        (setq def (and (locate-file-completion def path 'test) def)))