aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1999-04-06 23:23:23 +0000
committerRichard M. Stallman1999-04-06 23:23:23 +0000
commit635173de4a78b645a082682ffc9552c80db1c99e (patch)
treea20f3de9a278063721894336d6b49a31369ec742
parentacc9e99d8782a1f381d7358d17120eba37c08c4d (diff)
downloademacs-635173de4a78b645a082682ffc9552c80db1c99e.tar.gz
emacs-635173de4a78b645a082682ffc9552c80db1c99e.zip
(Info-find-node): Check for an anchor at the
proper place, before reading an indirect file.
-rw-r--r--lisp/info.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/info.el b/lisp/info.el
index 0deffb71bda..bec7d0ac96d 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -475,6 +475,7 @@ In standalone mode, \\<Info-mode-map>\\[Info-exit] exits Emacs itself."
475 (if (marker-position Info-tag-table-marker) 475 (if (marker-position Info-tag-table-marker)
476 476
477 (let (found-in-tag-table 477 (let (found-in-tag-table
478 found-anchor
478 found-mode 479 found-mode
479 (m Info-tag-table-marker)) 480 (m Info-tag-table-marker))
480 (save-excursion 481 (save-excursion
@@ -484,7 +485,9 @@ In standalone mode, \\<Info-mode-map>\\[Info-exit] exits Emacs itself."
484 485
485 ;; Search tag table 486 ;; Search tag table
486 (setq found-in-tag-table 487 (setq found-in-tag-table
487 (re-search-forward regexp nil t)) 488 (re-search-forward regexp nil t)
489 found-anchor
490 (string-equal "Ref:" (match-string 1)))
488 (if found-in-tag-table 491 (if found-in-tag-table
489 (setq guesspos (1+ (read (current-buffer))))) 492 (setq guesspos (1+ (read (current-buffer)))))
490 (setq found-mode major-mode)) 493 (setq found-mode major-mode))
@@ -503,9 +506,7 @@ In standalone mode, \\<Info-mode-map>\\[Info-exit] exits Emacs itself."
503 (setq guesspos (Info-read-subfile guesspos))))) 506 (setq guesspos (Info-read-subfile guesspos)))))
504 507
505 ;; Handle anchor 508 ;; Handle anchor
506 (if (and found-in-tag-table 509 (if found-anchor (goto-char guesspos)
507 (string-equal "Ref:" (match-string 1)))
508 (goto-char guesspos)
509 510
510 ;; Else we may have a node, which we search for: 511 ;; Else we may have a node, which we search for:
511 (goto-char (max (point-min) 512 (goto-char (max (point-min)