Mercurial > emacs
comparison src/lread.c @ 112132:4ef5cb86f2e8
Add --no-site-lisp option, make -Q use it. (Bug#5707)
* lisp/Makefile.in (EMACSOPT): Add --no-site-lisp.
* src/emacs.c (no_site_lisp): New int.
(USAGE1): Add --no-site-lisp, mention -Q uses it.
(main): Set no_site_lisp.
(standard_args): Add --no-site-lisp.
* src/lisp.h (no_site_lisp): New int.
* src/lread.c (init_lread): If no_site_lisp, don't re-add site-lisp
directories to Vload_path.
* etc/NEWS: Mention --no-site-lisp.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Thu, 06 Jan 2011 19:10:39 -0800 |
parents | ac49e05bfcf2 |
children | 7df2e30d72ec |
comparison
equal
deleted
inserted
replaced
112131:e0859218f943 | 112132:4ef5cb86f2e8 |
---|---|
1 /* Lisp parsing and input streams. | 1 /* Lisp parsing and input streams. |
2 | 2 |
3 Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, 1997, | 3 Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, 1997, |
4 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, | 4 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
5 2009, 2010 Free Software Foundation, Inc. | 5 2009, 2010, 2011 Free Software Foundation, Inc. |
6 | 6 |
7 This file is part of GNU Emacs. | 7 This file is part of GNU Emacs. |
8 | 8 |
9 GNU Emacs is free software: you can redistribute it and/or modify | 9 GNU Emacs is free software: you can redistribute it and/or modify |
10 it under the terms of the GNU General Public License as published by | 10 it under the terms of the GNU General Public License as published by |
4084 | 4084 |
4085 if (NILP (Fmember (tem, Vload_path))) | 4085 if (NILP (Fmember (tem, Vload_path))) |
4086 Vload_path = Fcons (tem, Vload_path); | 4086 Vload_path = Fcons (tem, Vload_path); |
4087 } | 4087 } |
4088 } | 4088 } |
4089 if (!NILP (sitelisp)) | 4089 if (!NILP (sitelisp) && !no_site_lisp) |
4090 Vload_path = nconc2 (Fnreverse (sitelisp), Vload_path); | 4090 Vload_path = nconc2 (Fnreverse (sitelisp), Vload_path); |
4091 } | 4091 } |
4092 } | 4092 } |
4093 } | 4093 } |
4094 else | 4094 else |