summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-01-06 19:10:39 -0800
committerGlenn Morris <rgm@gnu.org>2011-01-06 19:10:39 -0800
commit66b7b0fe80885b6357517a78f67189ab6a5dbd68 (patch)
tree4a854d4dca2a11e2b90a60eddd8f52036f8df1d9 /lisp
parent83f3eadc06b0fe40c669568394b14174018382c8 (diff)
downloademacs-66b7b0fe80885b6357517a78f67189ab6a5dbd68.tar.gz
emacs-66b7b0fe80885b6357517a78f67189ab6a5dbd68.tar.bz2
emacs-66b7b0fe80885b6357517a78f67189ab6a5dbd68.zip
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.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/Makefile.in4
2 files changed, 8 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac976549fee..faec22993fa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,12 @@
+2011-01-07 Glenn Morris <rgm@gnu.org>
+
+ * Makefile.in (EMACSOPT): Add --no-site-lisp.
+
2011-01-06 Ken Manheimer <ken.manheimer@gmail.com>
- * allout.el: (allout-back-to-current-heading): Ensure return to
+ * allout.el (allout-back-to-current-heading): Ensure return to
the visible containing topic, rather than a collapsed one.
- (allout-view-change-hook): Remove hook that was deprecated long
- ago.
+ (allout-view-change-hook): Remove hook that was deprecated long ago.
(allout-exposure-change-hook): Remove documentation remarks
concerning removed allout-view-change-hook.
(allout-flag-region): Remove invocation of and documentation
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 2b2081a25d0..c6b35edb44f 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1,6 +1,6 @@
# Maintenance productions for the Lisp directory
# Copyright (C) 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.
@@ -35,7 +35,7 @@ EMACS = ${abs_top_builddir}/src/emacs
# Command line flags for Emacs.
-EMACSOPT = -batch --no-site-file
+EMACSOPT = -batch --no-site-file --no-site-lisp
# Extra flags to pass to the byte compiler
BYTE_COMPILE_EXTRA_FLAGS =