(Info-find-node-2): Don't call info-insert-file-contents

with the `visit' argument.
(Info-extract-menu-node-name): Use `replace-regexps-in-string'.

diff --git a/lisp/info.el b/lisp/info.el
index 2f9d6e0202449a6f2356f100e1b1c736364c4ce9..660af03c959fbf57c35c7e9111b4b2317044d32a 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -609,7 +609,7 @@ a case-insensitive match is tried."
               (erase-buffer)
               (if (eq filename t)
                   (Info-insert-dir)
-                (info-insert-file-contents filename t)
+                (info-insert-file-contents filename nil)
                 (setq default-directory (file-name-directory filename)))
               (set-buffer-modified-p nil)
               ;; See whether file has a tag table.  Record the location if yes.
@@ -1393,12 +1393,7 @@ FOOTNOTENAME may be an abbreviation of the reference name."
              (buffer-substring-no-properties beg (1- (point)))
            (skip-chars-forward " \t\n")
            (Info-following-node-name (if multi-line "^.,\t" "^.,\t\n"))))
-    (while (setq i (string-match "\n" str i))
-      (aset str i ?\ ))
-    ;; Collapse multiple spaces.
-    (while (string-match "  +" str)
-      (setq str (replace-match " " t t str)))
-    str))
+    (replace-regexp-in-string "[ \n]+" " " str)))
 
 ;; No one calls this.
 ;;(defun Info-menu-item-sequence (list)