Mercurial > emacs

changeset 41713:d53ece895385

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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'.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 30 Nov 2001 23:59:28 +0000
parents c2b7b74ef973
children d03985d6f325
files lisp/info.el
diffstat 1 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/info.el	Fri Nov 30 23:58:24 2001 +0000
+++ b/lisp/info.el	Fri Nov 30 23:59:28 2001 +0000
@@ -609,7 +609,7 @@
               (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 @@
 	      (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)