From: Karl Heuer <kwzh@gnu.org>
Date: Thu, 7 Apr 1994 03:11:50 +0000 (+0000)
Subject: (Info-find-node): Don't try to backstep if no history.
X-Git-Tag: emacs-19.34~9136
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4db579ab73cd1bf0ca9624fc54b04f1104aac799;p=emacs.git

(Info-find-node): Don't try to backstep if no history.
(Info-insert-dir): Print sensible error message if no dir node.
---

diff --git a/lisp/info.el b/lisp/info.el
index 0fe52e844e0..ea39ddd19c5 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -304,7 +304,7 @@ In standalone mode, \\<Info-mode-map>\\[Info-exit] exits Emacs itself."
 	  (Info-select-node)))
     ;; If we did not finish finding the specified node,
     ;; go back to the previous one.
-    (or Info-current-node no-going-back
+    (or Info-current-node no-going-back (null Info-history)
 	(let ((hist (car Info-history)))
 	  (setq Info-history (cdr Info-history))
 	  (Info-find-node (nth 0 hist) (nth 1 hist) t)
@@ -373,6 +373,8 @@ In standalone mode, \\<Info-mode-map>\\[Info-exit] exits Emacs itself."
 				       Info-dir-file-attributes))))))
 	(setq dirs (cdr dirs)))
 
+      (or buffers
+	  (error "Can't find the info directory node"))
       ;; Distinguish the dir file that comes with Emacs from all the
       ;; others.  Yes, that is really what this is supposed to do.
       ;; If it doesn't work, fix it.