1 files changed, 13 insertions, 12 deletions

diff --git a/lisp/help.el b/lisp/help.el
index 051c56e65ba..2aef6283042 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -507,8 +507,9 @@ C-p Display information about the GNU project.
 C-w Display information on absence of warranty for GNU Emacs."
   help-map)
 
-;; Return a function which is called by the list containing point.
-;; If that gives no function, return a function whose name is around point.
+;; Return a function whose name is around point.
+;; If that gives no function, return a function which is called by the
+;; list containing point.
 ;; If that doesn't give a function, return nil.
 (defun function-called-at-point ()
   (let ((stab (syntax-table)))
@@ -516,6 +517,16 @@ C-w Display information on absence of warranty for GNU Emacs."
     (unwind-protect
         (or (condition-case ()
                 (save-excursion
+                  (or (not (zerop (skip-syntax-backward "_w")))
+                      (eq (char-syntax (following-char)) ?w)
+                      (eq (char-syntax (following-char)) ?_)
+                      (forward-sexp -1))
+                  (skip-chars-forward "'")
+                  (let ((obj (read (current-buffer))))
+                    (and (symbolp obj) (fboundp obj) obj)))
+              (error nil))
+            (condition-case ()
+                (save-excursion
                   (save-restriction
                     (narrow-to-region (max (point-min) (- (point) 1000)) (point-max))
                     ;; Move up to surrounding paren, then after the open.
@@ -528,16 +539,6 @@ C-w Display information on absence of warranty for GNU Emacs."
                     (let (obj)
                       (setq obj (read (current-buffer)))
                       (and (symbolp obj) (fboundp obj) obj))))
-              (error nil))
-            (condition-case ()
-                (save-excursion
-                  (or (not (zerop (skip-syntax-backward "_w")))
-                      (eq (char-syntax (following-char)) ?w)
-                      (eq (char-syntax (following-char)) ?_)
-                      (forward-sexp -1))
-                  (skip-chars-forward "'")
-                  (let ((obj (read (current-buffer))))
-                    (and (symbolp obj) (fboundp obj) obj)))
               (error nil)))
       (set-syntax-table stab))))