diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-05-26 14:23:28 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-05-26 14:23:28 -0700 |
| commit | eb7afdaddc286b57253cf0cd643b2ea594fb130c (patch) | |
| tree | e8ad9cb021a21127b91467e8a7057027978ca4ce /lisp/paths.el | |
| parent | 04188bb9ad26b7e79625571fbef39b304449496a (diff) | |
| download | emacs-eb7afdaddc286b57253cf0cd643b2ea594fb130c.tar.gz emacs-eb7afdaddc286b57253cf0cd643b2ea594fb130c.tar.bz2 emacs-eb7afdaddc286b57253cf0cd643b2ea594fb130c.zip | |
Don't mess with INFOPATH in ns builds
It's not necessary, and would break if INFOPATH was already set (bug#2791).
Ref also
http://lists.gnu.org/archive/html/emacs-devel/2009-05/msg00035.html
http://lists.gnu.org/archive/html/emacs-devel/2005-06/msg00064.html
* lisp/paths.el (Info-default-directory-list):
* lisp/info.el (info-initialize): For self-contained NS builds, put the
included info/ directory at the front.
* src/nsterm.m (ns_init_paths): Don't mess with INFOPATH.
Diffstat (limited to 'lisp/paths.el')
| -rw-r--r-- | lisp/paths.el | 7 |
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/" "/"))) |