Mercurial > hg > xemacs-beta

diff lisp/info.el @ 771:943eaba38521

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-13 08:51:24 by ben] The big ben-mule-21-5 check-in! Various files were added and deleted. See CHANGES-ben-mule. There are still some test suite failures. No crashes, though. Many of the failures have to do with problems in the test suite itself rather than in the actual code. I'll be addressing these in the next day or so -- none of the test suite failures are at all critical. Meanwhile I'll be trying to address the biggest issues -- i.e. build or run failures, which will almost certainly happen on various platforms. All comments should be sent to ben@xemacs.org -- use a Cc: if necessary when sending to mailing lists. There will be pre- and post- tags, something like pre-ben-mule-21-5-merge-in, and post-ben-mule-21-5-merge-in.
author ben
date Wed, 13 Mar 2002 08:54:06 +0000
parents 9f953fdc1394
children 79940b592197
line wrap: on
line diff
--- a/lisp/info.el	Fri Mar 08 13:33:14 2002 +0000
+++ b/lisp/info.el	Wed Mar 13 08:54:06 2002 +0000
@@ -2,6 +2,7 @@
 ;; Keywords: help
 
 ;; Copyright (C) 1985, 1986, 1993, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 2002 Ben Wing.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;;	   Richard Stallman <rms@gnu.ai.mit.edu>
@@ -617,9 +618,11 @@
 (defun Info-find-node (filename &optional nodename no-going-back tryfile line)
   "Go to an info node specified as separate FILENAME and NODENAME.
 Look for a plausible filename, or if not found then look for URL's and
-dispatch to the appropriate fn.  NO-GOING-BACK is non-nil if
-recovering from an error in this function; it says do not attempt
-further (recursive) error recovery.  TRYFILE is ??"
+dispatch to the appropriate fn.  NO-GOING-BACK is non-nil if recovering
+from an error in this function; it says do not attempt further (recursive)
+error recovery.  TRYFILE indicates that NODENAME might actually be a
+filename, so if we can't find a node of this name, try going to the `Top'
+node of a file of this name."
 
   (Info-setup-initial)
 
@@ -700,7 +703,9 @@
 	      (setq Info-current-file nil
 		    Info-current-subfile nil
 		    Info-current-file-completions nil
-		    Info-index-alternatives nil
+		    ;; Nooooooooooo!  Info-index can extend across more
+		    ;; than one file (e.g. XEmacs, Lispref)
+		    ;; Info-index-alternatives nil
 		    buffer-file-name nil)
 	      (erase-buffer)
 	      (if (string= "dir" (file-name-nondirectory filename))
@@ -1580,6 +1585,7 @@
 		       "")
 		     ")"
 		     (or Info-current-node ""))))))
+
 
 ;; Go to an info node specified with a filename-and-nodename string
 ;; of the sort that is found in pointers in nodes.
@@ -2294,8 +2300,10 @@
 		  (setq matches
 			(cons (list (buffer-substring (match-beginning 1)
 						      (match-end 1))
-				    (buffer-substring (match-beginning 2)
-						      (match-end 2))
+				    (format "(%s)%s" Info-current-file
+					    (buffer-substring
+					     (match-beginning 2)
+					     (match-end 2)))
 				    Info-current-node
 				    (string-to-int (concat "0"
 							   (buffer-substring