summaryrefslogtreecommitdiff
path: root/lisp/info.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/info.el')
-rw-r--r--lisp/info.el10
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/info.el b/lisp/info.el
index 237ca7a968e..2ed88108009 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1,7 +1,7 @@
;;; info.el --- info package for Emacs
;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: help
@@ -463,12 +463,12 @@ Do the right thing if the file has been compressed or zipped."
(expand-file-name "info/" installation-directory)
(if invocation-directory
(let ((infodir (expand-file-name
- "../info/"
+ "../share/info/"
invocation-directory)))
(if (file-exists-p infodir)
infodir
(setq infodir (expand-file-name
- "../../../info/"
+ "../../../share/info/"
invocation-directory))
(and (file-exists-p infodir)
infodir))))))
@@ -3997,7 +3997,9 @@ the variable `Info-file-list-for-emacs'."
(setq res (car hl) hl nil)
(setq hl (cdr hl))))
res))) 'info-xref-visited 'info-xref)))
- (when (and not-fontified-p (memq Info-hide-note-references '(t hide)))
+ (when (and not-fontified-p
+ (memq Info-hide-note-references '(t hide))
+ (not (Info-index-node)))
(put-text-property (match-beginning 2) (1- (match-end 6))
'invisible t)
;; Unhide the file name in parens