Mercurial > emacs
changeset 17312:647d2774c99e
(init_cmdargs) [MSDOS]: Make the change that sets
`installation-directory' if `info' is found as its subdirectory or
sibling, be conditioned on MSDOS (it makes trouble on Unix).
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sun, 06 Apr 1997 14:32:33 +0000 |
parents | f76a73cf699e |
children | 249fdb84dd26 |
files | src/emacs.c |
diffstat | 1 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/emacs.c Sat Apr 05 21:59:09 1997 +0000 +++ b/src/emacs.c Sun Apr 06 14:32:33 1997 +0000 @@ -271,11 +271,15 @@ tem = Fexpand_file_name (build_string ("lib-src"), dir); lib_src_exists = Ffile_exists_p (tem); +#ifdef MSDOS /* MSDOS installations frequently remove lib-src, but we still must set installation-directory, or else info won't find its files (it uses the value of installation-directory). */ tem = Fexpand_file_name (build_string ("info"), dir); info_exists = Ffile_exists_p (tem); +#else + info_exists = Qnil; +#endif if (!NILP (lib_src_exists) || !NILP (info_exists)) { @@ -293,8 +297,14 @@ tem = Fexpand_file_name (build_string ("../lib-src"), dir); lib_src_exists = Ffile_exists_p (tem); + +#ifdef MSDOS + /* See the MSDOS commentary above. */ tem = Fexpand_file_name (build_string ("../info"), dir); info_exists = Ffile_exists_p (tem); +#else + info_exists = Qnil; +#endif if (!NILP (lib_src_exists) || !NILP (info_exists)) {