procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

src/w32.c: Implement --no-site-lisp on Windows (bug#10208).

Browse source
This commit is contained in:
Juanma Barranquero 2011-12-08 00:14:13 +01:00
parent 1ea1c2fa5f
commit 6e44397c4a
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2011-12-07 Juanma Barranquero <lekktu@gmail.com>
* w32.c (init_environment): If no_site_lisp, remove site-lisp
dirs from the default value of EMACSLOADPATH (bug#10208).
2011-12-07 Glenn Morris <rgm@gnu.org>
* lread.c (init_lread): If no_site_lisp, exclude site-lisp/ in

18
src/w32.c
View file

@ -1654,6 +1654,24 @@ init_environment (char ** argv)
}
}
/* When Emacs is invoked with --no-site-lisp, we must remove the
site-lisp directories from the default value of EMACSLOADPATH.
This assumes that the site-lisp entries are at the front, and
that additional entries do exist. */
if (no_site_lisp)
{
for (i = 0; i < N_ENV_VARS; i++)
{
if (strcmp (env_vars[i].name, "EMACSLOADPATH") == 0)
{
char *site;
while ((site = strstr (env_vars[i].def_value, "site-lisp")))
env_vars[i].def_value = strchr (site, ';') + 1;
break;
}
}
}
#define SET_ENV_BUF_SIZE (4 * MAX_PATH) /* to cover EMACSLOADPATH */
/* Treat emacs_dir specially: set it unconditionally based on our