[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/info.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/info.el |
Date: |
Fri, 30 Nov 2001 18:59:28 -0500 |
Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.286 emacs/lisp/info.el:1.287
*** emacs/lisp/info.el:1.286 Thu Nov 29 18:44:01 2001
--- emacs/lisp/info.el Fri Nov 30 18:59:28 2001
***************
*** 609,615 ****
(erase-buffer)
(if (eq filename t)
(Info-insert-dir)
! (info-insert-file-contents filename t)
(setq default-directory (file-name-directory filename)))
(set-buffer-modified-p nil)
;; See whether file has a tag table. Record the location if
yes.
--- 609,615 ----
(erase-buffer)
(if (eq filename t)
(Info-insert-dir)
! (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,1404 ****
(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))
;; No one calls this.
;;(defun Info-menu-item-sequence (list)
--- 1393,1399 ----
(buffer-substring-no-properties beg (1- (point)))
(skip-chars-forward " \t\n")
(Info-following-node-name (if multi-line "^.,\t" "^.,\t\n"))))
! (replace-regexp-in-string "[ \n]+" " " str)))
;; No one calls this.
;;(defun Info-menu-item-sequence (list)