[Emacs-diffs] trunk r113202: * info.el (Info-try-follow-nearest-node): Move search for footnote

[Stephen Berman]

------------------------------------------------------------
revno: 113202
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14717
committer: Stephen Berman <address@hidden>
branch nick: trunk
timestamp: Thu 2013-06-27 11:20:04 +0200
message:
  * info.el (Info-try-follow-nearest-node): Move search for footnote
  above search for node name to prevent missing a footnote.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/info.el                   info.el-20091113204419-o5vbwnq5f7feedwu-261

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-27 09:08:14 +0000
+++ b/lisp/ChangeLog    2013-06-27 09:20:04 +0000
@@ -15,6 +15,11 @@
 
 2013-06-27  Stephen Berman  <address@hidden>
 
+       * 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  <address@hidden>
+
        * obsolete/otodo-mode.el: Add obsolescence info to file header.
 
 2013-06-27  Leo Liu  <address@hidden>

=== modified file 'lisp/info.el'
--- a/lisp/info.el      2013-05-27 22:42:11 +0000
+++ b/lisp/info.el      2013-06-27 09:20:04 +0000
@@ -3870,23 +3870,6 @@
      ((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 @@
            (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)