[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/find-func.el, v [EMACS_22_BASE]

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Glenn Morris <gm>       08/08/13 03:07:25

Index: find-func.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/find-func.el,v
retrieving revision 1.80.2.5
retrieving revision 1.80.2.6
diff -u -b -r1.80.2.5 -r1.80.2.6
--- find-func.el        31 Mar 2008 22:12:22 -0000      1.80.2.5
+++ find-func.el        13 Aug 2008 03:07:25 -0000      1.80.2.6
@@ -198,11 +198,17 @@
    (let* ((path (cons (or find-function-source-path load-path)
                      (find-library-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
+                  ;; `save-excursion' below in a `condition-case' to
+                  ;; avoid reporting a scan-error here.
+                  (condition-case nil
                   (save-excursion
                     (backward-up-list)
                     (forward-char)
-                    (backward-sexp -2)
+                        (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)))