comparison lisp/info.el @ 57329:52649ba67540

(Info-history, Info-toc): Fix Info headers. (Info-toc): Narrow buffer before Info-fontify-node. (Info-build-toc): Don't check for special Info file names. Set main-file to nil if Info-find-file returns a symbol.

57328:e2c34e75e585

        p)
    (with-current-buffer (get-buffer-create " *info-history*")
      (let ((inhibit-read-only t))
        (erase-buffer)
        (goto-char (point-min))
        (insert "\n\^_\nFile: history Node: Top, Up: (dir)\n\n")
        (insert "Recently Visited Nodes\n**********************\n\n")
        (insert "* Menu:\n\n")
        (let ((hl (delete '("history" "Top") Info-history-list)))
          (while hl
            (let ((file (nth 0 (car hl)))

(defun Info-toc ()
  "Go to a node with table of contents of the current Info file.
Table of contents is created from the tree structure of menus."
  (interactive)
  (let ((curr-file Info-current-file)
        (curr-node Info-current-node)
        p)
    (with-current-buffer (get-buffer-create " *info-toc*")
      (let ((inhibit-read-only t)
            (node-list (Info-build-toc curr-file)))
        (erase-buffer)
        (goto-char (point-min))
        (insert "\n\^_\nFile: toc Node: Top, Up: (dir)\n\n")
        (insert "Table of Contents\n*****************\n\n")
        (insert "*Note Top::\n")
        (Info-insert-toc
         (nth 2 (assoc "Top" node-list)) ; get Top nodes
         node-list 0 (substring-no-properties curr-file)))
      (if (not (bobp))
          (let ((Info-hide-note-references 'hide)
                (Info-fontify-visited-nodes nil))
            (Info-mode)
            (setq Info-current-file "toc" Info-current-node "Top")
            (Info-fontify-node)))
      (goto-char (point-min))
      (if (setq p (search-forward (concat "*Note " curr-node ":") nil t))
          (setq p (- p (length curr-node) 2))))
    (Info-find-node "toc" "Top")
    (goto-char (or p (point-min)))))

        (Info-insert-toc (nth 2 node) node-list (1+ level) curr-file)
        (setq nodes (cdr nodes))))))

(defun Info-build-toc (file)
  "Build table of contents from menus of Info FILE and its subfiles."
  (if (equal file "dir")
      (error "Table of contents for Info directory is not supported yet"))
  (with-temp-buffer
    (let* ((default-directory (or (and (stringp file)
                                       (file-name-directory
                                        (setq file (Info-find-file file))))
                                  default-directory))
           (main-file file)
           (sections '(("Top" "Top")))
           nodes subfiles)
      (while (or main-file subfiles)
        (or main-file (message "Searching subfile %s..." (car subfiles)))
        (erase-buffer)

57329:52649ba67540

        p)
    (with-current-buffer (get-buffer-create " *info-history*")
      (let ((inhibit-read-only t))
        (erase-buffer)
        (goto-char (point-min))
        (insert "\n\^_\nFile: history,  Node: Top,  Up: (dir)\n\n")
        (insert "Recently Visited Nodes\n**********************\n\n")
        (insert "* Menu:\n\n")
        (let ((hl (delete '("history" "Top") Info-history-list)))
          (while hl
            (let ((file (nth 0 (car hl)))

(defun Info-toc ()
  "Go to a node with table of contents of the current Info file.
Table of contents is created from the tree structure of menus."
  (interactive)
  (let ((curr-file (substring-no-properties Info-current-file))
        (curr-node (substring-no-properties Info-current-node))
        p)
    (with-current-buffer (get-buffer-create " *info-toc*")
      (let ((inhibit-read-only t)
            (node-list (Info-build-toc curr-file)))
        (erase-buffer)
        (goto-char (point-min))
        (insert "\n\^_\nFile: toc,  Node: Top,  Up: (dir)\n\n")
        (insert "Table of Contents\n*****************\n\n")
        (insert "*Note Top: (" curr-file ")Top.\n")
        (Info-insert-toc
         (nth 2 (assoc "Top" node-list)) ; get Top nodes
         node-list 0 curr-file))
      (if (not (bobp))
          (let ((Info-hide-note-references 'hide)
                (Info-fontify-visited-nodes nil))
            (Info-mode)
            (setq Info-current-file "toc" Info-current-node "Top")
            (goto-char (point-min))
            (narrow-to-region (or (re-search-forward "\n[\^_\f]\n" nil t)
                                  (point-min))
                              (point-max))
            (Info-fontify-node)
            (widen)))
      (goto-char (point-min))
      (if (setq p (search-forward (concat "*Note " curr-node ":") nil t))
          (setq p (- p (length curr-node) 2))))
    (Info-find-node "toc" "Top")
    (goto-char (or p (point-min)))))

        (Info-insert-toc (nth 2 node) node-list (1+ level) curr-file)
        (setq nodes (cdr nodes))))))

(defun Info-build-toc (file)
  "Build table of contents from menus of Info FILE and its subfiles."
  (with-temp-buffer
    (let* ((file (and (stringp file) (Info-find-file file)))
           (default-directory (or (and (stringp file)
                                       (file-name-directory file))
                                  default-directory))
           (main-file (and (stringp file) file))
           (sections '(("Top" "Top")))
           nodes subfiles)
      (while (or main-file subfiles)
        (or main-file (message "Searching subfile %s..." (car subfiles)))
        (erase-buffer)