procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Eli Zaretskii 2006-05-20 20:07:20 +00:00
parent c7292dcbba
commit 59ad6ae53b
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> (tiny change)
* progmodes/make-mode.el (makefile-mode): Doc fix.

7
lisp/info.el
View file

@ -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)