summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1998-08-01 19:03:50 +0000
committerRichard M. Stallman <rms@gnu.org>1998-08-01 19:03:50 +0000
commit9d499629f9a32a45e20135f4f049d070ab6a9b3c (patch)
tree06d2ce476700cb3e85e5329ed8b9d10a93af9e3d
parentd5637fa5493c73579222eadf72117230bb540bb8 (diff)
downloademacs-9d499629f9a32a45e20135f4f049d070ab6a9b3c.tar.gz
(Info-find-node): Position at the beginning of the node
after calling Info-select-node. (Info-insert-dir): Catch errors in insert-file-contents.
-rw-r--r--lisp/info.el16
1 files changed, 10 insertions, 6 deletions
diff --git a/lisp/info.el b/lisp/info.el
index e68b4c9f121..72bd7815fa0 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -505,7 +505,8 @@ In standalone mode, \\<Info-mode-map>\\[Info-exit] exits Emacs itself."
"No such anchor in tag table or node in tag table or file: %s"
nodename))))))
- (Info-select-node)))
+ (Info-select-node)
+ (goto-char (point-min))))
;; If we did not finish finding the specified node,
;; go back to the previous one.
(or Info-current-node no-going-back (null Info-history)
@@ -575,11 +576,14 @@ In standalone mode, \\<Info-mode-map>\\[Info-exit] exits Emacs itself."
(or buffers
(message "Composing main Info directory..."))
(set-buffer (generate-new-buffer " info dir"))
- (insert-file-contents file)
- (setq buffers (cons (current-buffer) buffers)
- Info-dir-file-attributes
- (cons (cons file attrs)
- Info-dir-file-attributes))))))
+ (condition-case nil
+ (progn
+ (insert-file-contents file)
+ (setq buffers (cons (current-buffer) buffers)
+ Info-dir-file-attributes
+ (cons (cons file attrs)
+ Info-dir-file-attributes)))
+ (error (kill-buffer (current-buffer))))))))
(or (cdr dirs) (setq Info-dir-contents-directory
(file-name-as-directory (car dirs))))
(setq dirs (cdr dirs))))