summaryrefslogtreecommitdiff
path: root/lisp/paths.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/paths.el')
-rw-r--r--lisp/paths.el7
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/paths.el b/lisp/paths.el
index 4d7e3718be2..a0d5cc7775d 100644
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -37,7 +37,12 @@
;; call custom-initialize-delay on it.
(defcustom Info-default-directory-list
(let* ((config-dir
- (file-name-as-directory configure-info-directory))
+ (file-name-as-directory
+ ;; Self-contained NS build with info/ in the app-bundle.
+ (or (and (featurep 'ns)
+ (let ((dir (expand-file-name "../info" data-directory)))
+ (if (file-directory-p dir) dir)))
+ configure-info-directory)))
(prefixes
;; Directory trees in which to look for info subdirectories
(prune-directory-list '("/usr/local/" "/usr/" "/opt/" "/")))