emacs: lisp/info.el comparison

comparison lisp/info.el @ 90043:e24e2e78deda

Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-69 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-643 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-649 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-650 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-651 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-655 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-656 Update from CVS: lisp/man.el (Man-xref-normal-file): Fix help-echo. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-657 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-658 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-659 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-660 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-661 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-667 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-668 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-61 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-68 Update from CVS

author	Miles Bader <miles@gnu.org>
date	Thu, 04 Nov 2004 08:55:40 +0000
parents	0fe073a08cef c7ff2d3a33ee
children	cb7f41387eb3

comparison

equal deleted inserted replaced

-:003d95404d71
+:e24e2e78deda
 (if index-node
 (setq Info-point-loc
 (if (match-beginning 5)
 (string-to-number (match-string 5))
 (buffer-substring (match-beginning 0) (1- (match-beginning 1)))))
-;;; Comment out the next line to use names of cross-references:
+;;; Uncomment next line to use names of cross-references in non-index nodes:
 ;;;       (setq Info-point-loc
 ;;;             (buffer-substring (match-beginning 0) (1- (match-beginning 1))))
 )
 (replace-regexp-in-string
 "[ \n]+" " "
 (and (marker-position Info-tag-table-marker)
 (buffer-modified-p)
 (message "Tags may have changed.  Use Info-tagify if necessary")))
 (defvar Info-file-list-for-emacs
-'("ediff" "eudc" "forms" "gnus" "info" ("mh" . "mh-e")
+'("ediff" "eudc" "forms" "gnus" "info" ("Info" . "info") ("mh" . "mh-e")
 "sc" "message" ("dired" . "dired-x") "viper" "vip" "idlwave"
 ("c" . "ccmode") ("c++" . "ccmode") ("objc" . "ccmode")
 ("java" . "ccmode") ("idl" . "ccmode") ("pike" . "ccmode")
 ("skeleton" . "autotype") ("auto-insert" . "autotype")
 ("copyright" . "autotype") ("executable" . "autotype")
 "Return a list of locations documenting COMMAND.
 The `info-file' property of COMMAND says which Info manual to search.
 If COMMAND has no property, the variable `Info-file-list-for-emacs'
 defines heuristics for which Info manual to try.
 The locations are of the format used in `Info-history', i.e.
-\(FILENAME NODENAME BUFFERPOS\)."
+\(FILENAME NODENAME BUFFERPOS\), where BUFFERPOS is the line number
-(let ((where '())
+in the first element of the returned list (which is treated specially in
+`Info-goto-emacs-command-node'), and 0 for the rest elements of a list."
+(let ((where '()) line-number
 	(cmd-desc (concat "^\\* +" (regexp-quote (symbol-name command))
 			  "\\( <[0-9]+>\\)?:\\s *\\(.*\\)\\."
-			  "\\([ \t]*(line[ \t]*[0-9]*)\\)?$"))
+			  "\\(?:[ \t\n]+(line +\\([0-9]+\\))\\)?"))
 	(info-file "emacs"))		;default
 ;; Determine which info file this command is documented in.
 (if (get command 'info-file)
 	(setq info-file (get command 'info-file))
 ;; If it doesn't say explicitly, test its name against
 	    (while (re-search-forward cmd-desc nil t)
 	      (setq where
 		    (cons (list Info-current-file
 				(match-string-no-properties 2)
 				0)
-			  where)))
+			  where))
+	      (setq line-number (and (match-beginning 3)
+				     (string-to-number (match-string 3)))))
 	    (and (setq nodes (cdr nodes) node (car nodes))))
 	(Info-goto-node node)))
-where))
+(if (and line-number where)
+	(cons (list (nth 0 (car where)) (nth 1 (car where)) line-number)
+	      (cdr where))
+where)))
+;;;###autoload (put 'Info-goto-emacs-command-node 'info-file "emacs")
 ;;;###autoload
 (defun Info-goto-emacs-command-node (command)
 "Go to the Info node in the Emacs manual for command COMMAND.
 The command is found by looking up in Emacs manual's indices
 or in another manual found via COMMAND's `info-file' property or
 	    (info))
 	  (or (eq major-mode 'Info-mode) (pop-to-buffer "*info*"))
 	  ;; Bind Info-history to nil, to prevent the last Index node
 	  ;; visited by Info-find-emacs-command-nodes from being
 	  ;; pushed onto the history.
-	  (let ((Info-history nil) (Info-history-list nil))
+	  (let ((Info-history nil) (Info-history-list nil)
-	    (Info-find-node (car (car where))
+		(line-number (nth 2 (car where))))
-			    (car (cdr (car where)))))
+	    (Info-find-node (nth 0 (car where)) (nth 1 (car where)))
+	    (if (and (integerp line-number) (> line-number 0))
+		(forward-line (1- line-number))))
 	  (if (> num-matches 1)
 	      (progn
 		;; (car where) will be pushed onto Info-history
 		;; when/if they go to another node.  Put the other
 		;; nodes that were found on the history.
 			 (if (> num-matches 2) "ies" "y")
 			 (substitute-command-keys "\\[Info-last]")
 			 (if (> num-matches 2) "them" "it")))))
 (error "Couldn't find documentation for %s" command))))
+;;;###autoload (put 'Info-goto-emacs-key-command-node 'info-file "emacs")
 ;;;###autoload
 (defun Info-goto-emacs-key-command-node (key)
 "Go to the node in the Emacs manual which describes the command bound to KEY.
 KEY is a string.
 Interactively, if the binding is `execute-extended-command', a command is read.

Mercurial > emacs

comparison lisp/info.el @ 90043:e24e2e78deda