Mercurial > hg > xemacs-beta

comparison lisp/info.el @ 3693:3b847cba6d71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2006-11-22 02:20:20 by stephent] Update buffer-file-truename with buffer-file-name in info.el. Document invariant. <874pssmen5.fsf@uwakimon.sk.tsukuba.ac.jp>
author stephent
date Wed, 22 Nov 2006 02:20:34 +0000
parents e5c8780c8229
children 3ff01259c4a2
comparison
equal deleted inserted replaced
3692:e8f894dc0700 3693:3b847cba6d71
715 Info-current-subfile nil 715 Info-current-subfile nil
716 Info-current-file-completions nil 716 Info-current-file-completions nil
717 ;; Nooooooooooo! Info-index can extend across more 717 ;; Nooooooooooo! Info-index can extend across more
718 ;; than one file (e.g. XEmacs, Lispref) 718 ;; than one file (e.g. XEmacs, Lispref)
719 ;; Info-index-alternatives nil 719 ;; Info-index-alternatives nil
720 buffer-file-name nil) 720 buffer-file-name nil
721 buffer-file-truename nil)
721 (erase-buffer) 722 (erase-buffer)
722 (if (string= "dir" (file-name-nondirectory filename)) 723 (if (string= "dir" (file-name-nondirectory filename))
723 (Info-insert-dir) 724 (Info-insert-dir)
724 (Info-insert-file-contents filename t) 725 (Info-insert-file-contents filename t)
725 (setq default-directory (file-name-directory filename))) 726 (setq default-directory (file-name-directory filename)))
1050 (kill-buffer (car lbuffers)) 1051 (kill-buffer (car lbuffers))
1051 (setq lbuffers (cdr lbuffers))) 1052 (setq lbuffers (cdr lbuffers)))
1052 (message "Composing main Info directory...done")) 1053 (message "Composing main Info directory...done"))
1053 (setq Info-dir-contents (buffer-string))) 1054 (setq Info-dir-contents (buffer-string)))
1054 (setq default-directory (file-name-as-directory Info-dir-contents-directory)) 1055 (setq default-directory (file-name-as-directory Info-dir-contents-directory))
1055 (setq buffer-file-name (caar Info-dir-file-attributes))) 1056 (setq buffer-file-name (caar Info-dir-file-attributes)
1057 buffer-file-truename (file-truename buffer-file-name)))
1056 1058
1057 (defmacro Info-directory-files (dir-file &optional all full nosort files-only) 1059 (defmacro Info-directory-files (dir-file &optional all full nosort files-only)
1058 "Return a list of Info files living in the same directory as DIR-FILE. 1060 "Return a list of Info files living in the same directory as DIR-FILE.
1059 This list actually contains the files living in this directory, except for 1061 This list actually contains the files living in this directory, except for
1060 the dir file itself and the secondary info files (foo-1 foo-2 etc). 1062 the dir file itself and the secondary info files (foo-1 foo-2 etc).
1421 (setq lastfilename thisfilename) 1423 (setq lastfilename thisfilename)
1422 (setq lastfilepos thisfilepos)) 1424 (setq lastfilepos thisfilepos))
1423 (throw 'foo t))))) 1425 (throw 'foo t)))))
1424 (or (equal Info-current-subfile lastfilename) 1426 (or (equal Info-current-subfile lastfilename)
1425 (let ((buffer-read-only nil)) 1427 (let ((buffer-read-only nil))
1426 (setq buffer-file-name nil) 1428 (setq buffer-file-name nil
1429 buffer-file-truename nil)
1427 (widen) 1430 (widen)
1428 (erase-buffer) 1431 (erase-buffer)
1429 (Info-insert-file-contents (Info-suffixed-file 1432 (Info-insert-file-contents (Info-suffixed-file
1430 (expand-file-name lastfilename 1433 (expand-file-name lastfilename
1431 (file-name-directory 1434 (file-name-directory
1529 (concat (cdr (car suff)) " < " file)))) 1532 (concat (cdr (car suff)) " < " file))))
1530 (message "%s..." command) 1533 (message "%s..." command)
1531 (call-process shell-file-name nil t nil shell-command-switch command) 1534 (call-process shell-file-name nil t nil shell-command-switch command)
1532 (message "") 1535 (message "")
1533 (when visit 1536 (when visit
1534 (setq buffer-file-name file) 1537 (setq buffer-file-name file
1538 buffer-file-truename (file-truename buffer-file-name))
1535 (set-buffer-modified-p nil) 1539 (set-buffer-modified-p nil)
1536 (clear-visited-file-modtime))) 1540 (clear-visited-file-modtime)))
1537 (insert-file-contents file visit)))) 1541 (insert-file-contents file visit))))
1538 1542
1539 (defun Info-select-node () 1543 (defun Info-select-node ()