aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--generic/proof-site.el24
1 files changed, 12 insertions, 12 deletions
diff --git a/generic/proof-site.el b/generic/proof-site.el
index 55462720..28135f1d 100644
--- a/generic/proof-site.el
+++ b/generic/proof-site.el
@@ -72,18 +72,18 @@ You can use customize to set this variable."
:group 'proof-general-internals)
;; Add the info directory to the end of Emacs Info path if need be.
-;; It's easier to do this after Info has loaded because of the
-;; complicated way the Info-directory-list is set.
-
-(eval-after-load
- "info"
- '(or (member proof-info-directory Info-directory-list)
- (progn
- (setq Info-directory-list
- (cons proof-info-directory
- Info-directory-list))
- ;; Clear cache of info dir
- (setq Info-dir-contents nil))))
+(if (and (boundp 'Info-directory-list) (consp Info-directory-list))
+ ;; Info is already initialized. Update its variables.
+ ;; This probably never happens. -stef
+ (if (not (member proof-info-directory Info-directory-list))
+ (progn
+ (setq Info-directory-list
+ (cons proof-info-directory Info-directory-list))
+ (setq Info-dir-contents nil)))
+ ;; Info is not yet initialized. Change its default.
+ (if (not (member proof-info-directory Info-default-directory-list))
+ (setq Info-default-directory-list
+ (cons proof-info-directory Info-default-directory-list))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;