(info-apropos): Make sure current-file and current-node have non-nil values.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b543742f0ffc3dcdf7997ea199d0b3a6d5d18514..16c15ec4863ec842834dbbb959d4e1d41cda6515 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-20  Eli Zaretskii  <eliz@gnu.org>
+
+       * info.el (info-apropos): Make sure current-file and current-node
+       have non-nil values.
+
 2006-05-20  Micha\e,Ak\e(Bl Cadilhac  <michael.cadilhac@lrde.org>  (tiny change)
 
        * progmodes/make-mode.el (makefile-mode): Doc fix.

diff --git a/lisp/info.el b/lisp/info.el
index 163441893dbf798c238f4d50453fbc3f2274eb64..d689556b321e45e5c51d940b9ac5791c89bd63f5 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2907,6 +2907,13 @@ Build a menu of the possible matches."
          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)