diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2001-11-30 23:59:28 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2001-11-30 23:59:28 +0000 |
| commit | f7d5479b3d89a3a3af03adf2ed66d3c6be56b40c (patch) | |
| tree | db3ef5af543fdf8537aaffa47b85b17497e4695f /lisp/info.el | |
| parent | f71d927d8b0175b29dc5b79508e7a3360d533618 (diff) | |
| download | emacs-f7d5479b3d89a3a3af03adf2ed66d3c6be56b40c.tar.gz | |
(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'.
Diffstat (limited to 'lisp/info.el')
| -rw-r--r-- | lisp/info.el | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lisp/info.el b/lisp/info.el index 2f9d6e02024..660af03c959 100644 --- 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) |