From 38264cc938d9f2fb63f1697b4ec3dc9b86640e5f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 26 May 2012 14:58:01 -0700 Subject: Replace w32-init-info through the magic of custom-initialize-delay * lisp/w32-fns.el (w32-init-info): Remove. * lisp/paths.el (Info-default-directory-list): Add w32-init-info equivalent. --- lisp/w32-fns.el | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'lisp/w32-fns.el') diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index aff2df3dc77..1769ee73be5 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -192,24 +192,6 @@ You should set this to t when using a non-system shell.\n\n")))) (w32-get-locale-info locale) (w32-get-locale-info locale t)))))) -;; Setup Info-default-directory-list to include the info directory -;; near where Emacs executable was installed. We used to set INFOPATH, -;; but when this is set Info-default-directory-list is ignored. We -;; also cannot rely upon what is set in paths.el because they assume -;; that configuration during build time is correct for runtime. -(defun w32-init-info () - (let* ((instdir (file-name-directory invocation-directory)) - (dir1 (expand-file-name "../info/" instdir)) - (dir2 (expand-file-name "../../../info/" instdir))) - (if (file-exists-p dir1) - (setq Info-default-directory-list - (append Info-default-directory-list (list dir1))) - (if (file-exists-p dir2) - (setq Info-default-directory-list - (append Info-default-directory-list (list dir2))))))) - -(add-hook 'before-init-hook 'w32-init-info) - ;; The variable source-directory is used to initialize Info-directory-list. ;; However, the common case is that Emacs is being used from a binary ;; distribution, and the value of source-directory is meaningless in that -- cgit v1.2.1