* info.el (Info-try-follow-nearest-node): Move search for footnote

above search for node name to prevent missing a footnote.

Fixes: debbugs:14717

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c36162b0178f1da66edb493371b8aaef194d30f..c8b213b65295388f46e9f1954d473519b53ee535 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -13,6 +13,11 @@
 
        * net/shr.el (add-face-text-property): Removed compat definition.
 
+2013-06-27  Stephen Berman  <stephen.berman@gmx.net>
+
+       * info.el (Info-try-follow-nearest-node): Move search for footnote
+       above search for node name to prevent missing a footnote (bug#14717).
+
 2013-06-27  Stephen Berman  <stephen.berman@gmx.net>
 
        * obsolete/otodo-mode.el: Add obsolescence info to file header.

diff --git a/lisp/info.el b/lisp/info.el
index 9dc312fc697348ef42855c6745c3ed9161d9af05..f9851a0c1e8a83db071a43c0e2c5d978d6c00458 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3870,23 +3870,6 @@ If FORK is non-nil, it is passed to `Info-goto-node'."
      ((setq node (Info-get-token (point) "\\*note[ \n\t]+"
                                 "\\*note[ \n\t]+\\([^:]*\\):\\(:\\|[ \n\t]*(\\)?"))
       (Info-follow-reference node fork))
-     ;; menu item: node name
-     ((setq node (Info-get-token (point) "\\* +" "\\* +\\([^:]*\\)::"))
-      (Info-goto-node node fork))
-     ;; menu item: node name or index entry
-     ((Info-get-token (point) "\\* +" "\\* +\\(.*\\): ")
-      (beginning-of-line)
-      (forward-char 2)
-      (setq node (Info-extract-menu-node-name nil (Info-index-node)))
-      (Info-goto-node node fork))
-     ((setq node (Info-get-token (point) "Up: " "Up: \\([^,\n\t]*\\)"))
-      (Info-goto-node node fork))
-     ((setq node (Info-get-token (point) "Next: " "Next: \\([^,\n\t]*\\)"))
-      (Info-goto-node node fork))
-     ((setq node (Info-get-token (point) "File: " "File: \\([^,\n\t]*\\)"))
-      (Info-goto-node "Top" fork))
-     ((setq node (Info-get-token (point) "Prev: " "Prev: \\([^,\n\t]*\\)"))
-      (Info-goto-node node fork))
      ;; footnote
      ((setq node (Info-get-token (point) "(" "\\(([0-9]+)\\)"))
       (let ((old-point (point)) new-point)
@@ -3904,7 +3887,24 @@ If FORK is non-nil, it is passed to `Info-goto-node'."
            (progn
              (goto-char new-point)
              (setq node t))
-         (setq node nil)))))
+         (setq node nil))))
+     ;; menu item: node name
+     ((setq node (Info-get-token (point) "\\* +" "\\* +\\([^:]*\\)::"))
+      (Info-goto-node node fork))
+     ;; menu item: node name or index entry
+     ((Info-get-token (point) "\\* +" "\\* +\\(.*\\): ")
+      (beginning-of-line)
+      (forward-char 2)
+      (setq node (Info-extract-menu-node-name nil (Info-index-node)))
+      (Info-goto-node node fork))
+     ((setq node (Info-get-token (point) "Up: " "Up: \\([^,\n\t]*\\)"))
+      (Info-goto-node node fork))
+     ((setq node (Info-get-token (point) "Next: " "Next: \\([^,\n\t]*\\)"))
+      (Info-goto-node node fork))
+     ((setq node (Info-get-token (point) "File: " "File: \\([^,\n\t]*\\)"))
+      (Info-goto-node "Top" fork))
+     ((setq node (Info-get-token (point) "Prev: " "Prev: \\([^,\n\t]*\\)"))
+      (Info-goto-node node fork)))
     node))
 
 (defun Info-mouse-follow-link (click)