Mercurial > emacs

diff src/lread.c @ 112132:4ef5cb86f2e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/src/lread.c	Thu Jan 06 19:04:21 2011 -0800
+++ b/src/lread.c	Thu Jan 06 19:10:39 2011 -0800
@@ -2,7 +2,7 @@
 
 Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, 1997,
   1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010  Free Software Foundation, Inc.
+  2009, 2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -4086,7 +4086,7 @@
 			Vload_path = Fcons (tem, Vload_path);
 		    }
 		}
-	      if (!NILP (sitelisp))
+	      if (!NILP (sitelisp) && !no_site_lisp)
 		Vload_path = nconc2 (Fnreverse (sitelisp), Vload_path);
 	    }
 	}