Mercurial > emacs
comparison lisp/info.el @ 41713:d53ece895385
(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 | 3317b62de647 |
children | b04cfaf9585d |
comparison
equal
deleted
inserted
replaced
41712:c2b7b74ef973 | 41713:d53ece895385 |
---|---|
607 Info-current-file-completions nil | 607 Info-current-file-completions nil |
608 buffer-file-name nil) | 608 buffer-file-name nil) |
609 (erase-buffer) | 609 (erase-buffer) |
610 (if (eq filename t) | 610 (if (eq filename t) |
611 (Info-insert-dir) | 611 (Info-insert-dir) |
612 (info-insert-file-contents filename t) | 612 (info-insert-file-contents filename nil) |
613 (setq default-directory (file-name-directory filename))) | 613 (setq default-directory (file-name-directory filename))) |
614 (set-buffer-modified-p nil) | 614 (set-buffer-modified-p nil) |
615 ;; See whether file has a tag table. Record the location if yes. | 615 ;; See whether file has a tag table. Record the location if yes. |
616 (goto-char (point-max)) | 616 (goto-char (point-max)) |
617 (forward-line -8) | 617 (forward-line -8) |
1391 (setq str | 1391 (setq str |
1392 (if (looking-at ":") | 1392 (if (looking-at ":") |
1393 (buffer-substring-no-properties beg (1- (point))) | 1393 (buffer-substring-no-properties beg (1- (point))) |
1394 (skip-chars-forward " \t\n") | 1394 (skip-chars-forward " \t\n") |
1395 (Info-following-node-name (if multi-line "^.,\t" "^.,\t\n")))) | 1395 (Info-following-node-name (if multi-line "^.,\t" "^.,\t\n")))) |
1396 (while (setq i (string-match "\n" str i)) | 1396 (replace-regexp-in-string "[ \n]+" " " str))) |
1397 (aset str i ?\ )) | |
1398 ;; Collapse multiple spaces. | |
1399 (while (string-match " +" str) | |
1400 (setq str (replace-match " " t t str))) | |
1401 str)) | |
1402 | 1397 |
1403 ;; No one calls this. | 1398 ;; No one calls this. |
1404 ;;(defun Info-menu-item-sequence (list) | 1399 ;;(defun Info-menu-item-sequence (list) |
1405 ;; (while list | 1400 ;; (while list |
1406 ;; (Info-menu (car list)) | 1401 ;; (Info-menu (car list)) |