# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1148155605 0
# Node ID ab54c05cde250e11d6a0d479783e03faa56c7820
# Parent  49881f932176391cf417e94974386d52dc70ba04
(info-apropos): Make sure current-file and current-node have non-nil values.

diff -r 49881f932176 -r ab54c05cde25 lisp/info.el
--- a/lisp/info.el	Sat May 20 19:40:53 2006 +0000
+++ b/lisp/info.el	Sat May 20 20:06:45 2006 +0000
@@ -2907,6 +2907,13 @@
 	  manuals matches node nodes)
       (let ((Info-fontify-maximum-menu-size nil))
 	(Info-directory)
+	;; current-node and current-file are nil when they invoke info-apropos
+	;; as the first Info command, i.e. info-apropos loads info.el.  In that
+	;; case, we use (DIR)Top instead, to avoid signalling an error after
+	;; the search is complete.
+	(when (null current-node)
+	  (setq current-file Info-current-file)
+	  (setq current-node Info-current-node))
 	(message "Searching indices...")
 	(goto-char (point-min))
 	(re-search-forward "\\* Menu: *\n" nil t)