diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-07-09 21:04:28 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-07-09 21:04:28 -0400 |
| commit | 9e059e3fde0f95b0b06ebce10f2985201e54c11c (patch) | |
| tree | e52878b1f1fff02dee5b327ab042c35de9ac3f87 /src/emacs.c | |
| parent | 4107c81e8926223bc8f2c50f4436d8a36d6d5914 (diff) | |
| download | emacs-9e059e3fde0f95b0b06ebce10f2985201e54c11c.tar.gz | |
Stop ns builds setting the EMACSLOADPATH environment variable
Ref bugs 4309, 6401, etc.
This is the last environment variable (ab)used by the ns port in this way.
* src/nsterm.m (ns_load_path): Rename from ns_init_paths.
Now it does not set EMACSLOADPATH, just returns the load-path string.
* src/nsterm.h: Update accordingly.
* src/lread.c [HAVE_NS]: Include nsterm.h.
(init_lread) [HAVE_NS]: Use ns_load_path.
* src/emacs.c (main) [HAVE_NS]: No longer call ns_init_paths.
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/emacs.c b/src/emacs.c index 2b386bac176..2194cfead16 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1426,13 +1426,6 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem init_ntproc (); /* must precede init_editfns. */ #endif -#ifdef HAVE_NS -#ifndef CANNOT_DUMP - if (initialized) -#endif - ns_init_paths (); -#endif - /* Initialize and GC-protect Vinitial_environment and Vprocess_environment before set_initial_environment fills them in. */ |