Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 102770. ------------------------------------------------------------ revno: 102770 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-01-06 19:10:39 -0800 message: 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. diff: === modified file 'etc/NEWS' --- etc/NEWS 2011-01-04 16:57:45 +0000 +++ etc/NEWS 2011-01-07 03:10:39 +0000 @@ -59,6 +59,9 @@ command line arguments, and the EMACS_UNIBYTE environment variable, no longer have any effect. (They were declared obsolete in Emacs 23.) +** New command line option `--no-site-lisp' removes site-lisp directories +from load-path. -Q now implies this. + * Changes in Emacs 24.1 === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-01-06 07:19:05 +0000 +++ lisp/ChangeLog 2011-01-07 03:10:39 +0000 @@ -1,9 +1,12 @@ +2011-01-07 Glenn Morris + + * Makefile.in (EMACSOPT): Add --no-site-lisp. + 2011-01-06 Ken Manheimer - * 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 === modified file 'lisp/Makefile.in' --- lisp/Makefile.in 2010-11-22 22:09:17 +0000 +++ lisp/Makefile.in 2011-01-07 03:10:39 +0000 @@ -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 @@ # 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 = === modified file 'src/ChangeLog' --- src/ChangeLog 2011-01-05 13:09:07 +0000 +++ src/ChangeLog 2011-01-07 03:10:39 +0000 @@ -1,3 +1,13 @@ +2011-01-07 Glenn Morris + + * 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. + * lisp.h (no_site_lisp): New int. + * lread.c (init_lread): If no_site_lisp, don't re-add site-lisp + directories to Vload_path. + 2011-01-05 Andreas Schwab * alloc.c (mark_stack): Use __builtin_unwind_init if available. === modified file 'src/emacs.c' --- src/emacs.c 2011-01-04 04:42:43 +0000 +++ src/emacs.c 2011-01-07 03:10:39 +0000 @@ -231,6 +231,9 @@ /* Nonzero means Emacs was run in --quick mode. */ int inhibit_x_resources; +/* Nonzero means remove site-lisp directories from load-path. */ +int no_site_lisp; + /* Name for the server started by the daemon.*/ static char *daemon_name; @@ -268,9 +271,11 @@ --no-init-file, -q load neither ~/.emacs nor default.el\n\ --no-shared-memory, -nl do not use shared memory\n\ --no-site-file do not load site-start.el\n\ +--no-site-lisp, -nsl do not add site-lisp directories to load-path\n\ --no-splash do not display a splash screen on startup\n\ --no-window-system, -nw do not communicate with X, ignoring $DISPLAY\n\ ---quick, -Q equivalent to -q --no-site-file --no-splash\n\ +--quick, -Q equivalent to:\n\ + -q --no-site-file --no-site-lisp --no-splash\n\ --script FILE run FILE as an Emacs Lisp script\n\ --terminal, -t DEVICE use DEVICE for terminal I/O\n\ --user, -u USER load ~USER/.emacs instead of your own\n\ @@ -1341,6 +1346,9 @@ no_loadup = argmatch (argv, argc, "-nl", "--no-loadup", 6, NULL, &skip_args); + no_site_lisp + = argmatch (argv, argc, "-nsl", "--no-site-lisp", 11, NULL, &skip_args); + #ifdef HAVE_NS ns_alloc_autorelease_pool(); if (!noninteractive) @@ -1409,9 +1417,27 @@ && argv[count_before + 1][1] == '-') argv[count_before + 1] = "-d"; + if (! no_site_lisp) + { + if (argmatch (argv, argc, "-Q", "--quick", 3, NULL, &skip_args) + || argmatch (argv, argc, "-quick", 0, 2, NULL, &skip_args)) + no_site_lisp = 1; + } + /* Don't actually discard this arg. */ skip_args = count_before; } +#else /* !HAVE_X_WINDOWS */ + if (! no_site_lisp) + { + int count_before = skip_args; + + if (argmatch (argv, argc, "-Q", "--quick", 3, NULL, &skip_args) + || argmatch (argv, argc, "-quick", 0, 2, NULL, &skip_args)) + no_site_lisp = 1; + + skip_args = count_before; + } #endif /* argmatch must not be used after here, @@ -1743,10 +1769,12 @@ { "-daemon", "--daemon", 99, 0 }, { "-help", "--help", 90, 0 }, { "-nl", "--no-loadup", 70, 0 }, + { "-nsl", "--no-site-lisp", 65, 0 }, /* -d must come last before the options handled in startup.el. */ { "-d", "--display", 60, 1 }, { "-display", 0, 60, 1 }, /* Now for the options handled in `command-line' (startup.el). */ + /* (Note that to imply -nsl, -Q is partially handled here.) */ { "-Q", "--quick", 55, 0 }, { "-quick", 0, 55, 0 }, { "-q", "--no-init-file", 50, 0 }, === modified file 'src/lisp.h' --- src/lisp.h 2010-12-27 17:29:38 +0000 +++ src/lisp.h 2011-01-07 03:10:39 +0000 @@ -1,6 +1,6 @@ /* Fundamental definitions for GNU Emacs Lisp interpreter. Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -3225,6 +3225,9 @@ /* Nonzero means don't load X resources or Windows Registry settings. */ extern int inhibit_x_resources; +/* Nonzero means remove site-lisp directories from load-path. */ +extern int no_site_lisp; + /* Pipe used to send exit notification to the daemon parent at startup. */ extern int daemon_pipe[2]; @@ -3668,5 +3671,3 @@ #endif /* EMACS_LISP_H */ -/* arch-tag: 9b2ed020-70eb-47ac-94ee-e1c2a5107d5e - (do not change this comment) */ === modified file 'src/lread.c' --- src/lread.c 2010-12-27 17:29:38 +0000 +++ src/lread.c 2011-01-07 03:10:39 +0000 @@ -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); } } ------------------------------------------------------------ revno: 102769 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-01-06 19:04:21 -0800 message: ChangeLog fix. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-01-04 12:38:33 +0000 +++ doc/misc/ChangeLog 2011-01-07 03:04:21 +0000 @@ -18,7 +18,7 @@ 2010-12-15 Andrew Cohen - * gnus.texi (The hyrex Engine): Say that this engine as obsolete. + * gnus.texi (The hyrex Engine): Say that this engine is obsolete. 2010-12-14 Andrew Cohen @@ -7529,7 +7529,7 @@ ;; End: Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, - 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This file is part of GNU Emacs. ------------------------------------------------------------ revno: 102768 committer: Tassilo Horn branch nick: trunk timestamp: Thu 2011-01-06 08:35:47 +0100 message: * themes/dev-tsdh-light-theme.el (dev-tsdh-light): New theme. * themes/dev-tsdh-dark-theme.el (dev-tsdh-dark): New theme. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2011-01-04 12:44:17 +0000 +++ etc/ChangeLog 2011-01-06 07:35:47 +0000 @@ -1,3 +1,8 @@ +2011-01-06 Tassilo Horn + + * themes/dev-tsdh-light-theme.el (dev-tsdh-light): New theme. + * themes/dev-tsdh-dark-theme.el (dev-tsdh-dark): New theme. + 2011-01-04 Jan Moringen * NEWS: Extended behaviour of dbus-register-{method,property}. === added file 'etc/themes/dev-tsdh-dark-theme.el' --- etc/themes/dev-tsdh-dark-theme.el 1970-01-01 00:00:00 +0000 +++ etc/themes/dev-tsdh-dark-theme.el 2011-01-06 07:35:47 +0000 @@ -0,0 +1,59 @@ +;;; dev-tsdh-dark-theme.el --- Tassilo's dark custom theme + +;; Copyright (C) 2011 Free Software Foundation, Inc. + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Code: + +(deftheme dev-tsdh-dark + "Theme with dark background used and created by Tassilo Horn.") + +(custom-theme-set-faces + 'dev-tsdh-dark + '(default ((t (:background "gray20" :foreground "white smoke")))) + '(diff-added ((t (:inherit diff-changed :background "light green")))) + '(diff-changed ((t (:background "light steel blue")))) + '(diff-indicator-added ((t (:inherit diff-indicator-changed)))) + '(diff-indicator-changed ((t (:weight bold)))) + '(diff-indicator-removed ((t (:inherit diff-indicator-changed)))) + '(diff-removed ((t (:inherit diff-changed :background "sandy brown")))) + '(hl-line ((t (:background "grey28")))) + '(message-header-subject ((t (:foreground "SkyBlue")))) + '(minibuffer-prompt ((t (:background "yellow" :foreground "medium blue" :box (:line-width -1 :color "red" :style released-button) :weight bold)))) + '(mode-line ((t (:box (:line-width -1 :color "red" :style released-button) :family "DejaVu Sans")))) + '(mode-line-inactive ((t (:inherit mode-line :foreground "dim gray")))) + '(org-agenda-date ((t (:inherit org-agenda-structure)))) + '(org-agenda-date-today ((t (:inherit org-agenda-date :underline t)))) + '(org-agenda-date-weekend ((t (:inherit org-agenda-date :foreground "dark green")))) + '(org-agenda-structure ((t (:foreground "SkyBlue" :weight bold)))) + '(org-hide ((t (:foreground "gray30")))) + '(org-tag ((t (:weight bold)))) + '(outline-1 ((t (:inherit font-lock-function-name-face :weight bold)))) + '(outline-2 ((t (:inherit font-lock-variable-name-face :weight bold)))) + '(outline-3 ((t (:inherit font-lock-keyword-face :weight bold)))) + '(outline-4 ((t (:inherit font-lock-comment-face :weight bold)))) + '(outline-5 ((t (:inherit font-lock-type-face :weight bold)))) + '(outline-6 ((t (:inherit font-lock-constant-face :weight bold)))) + '(outline-7 ((t (:inherit font-lock-builtin-face :weight bold)))) + '(outline-8 ((t (:inherit font-lock-string-face :weight bold)))) + '(region ((t (:background "SteelBlue4")))) + '(show-paren-match ((t (:background "DarkGreen")))) + '(show-paren-mismatch ((t (:background "deep pink")))) + '(window-number-face ((t (:foreground "red" :weight bold))))) + +(provide-theme 'dev-tsdh-dark) + === added file 'etc/themes/dev-tsdh-light-theme.el' --- etc/themes/dev-tsdh-light-theme.el 1970-01-01 00:00:00 +0000 +++ etc/themes/dev-tsdh-light-theme.el 2011-01-06 07:35:47 +0000 @@ -0,0 +1,58 @@ +;;; dev-tsdh-light-theme.el --- Tassilo's light custom theme + +;; Copyright (C) 2011 Free Software Foundation, Inc. + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Code: + +(deftheme dev-tsdh-light + "Black on white theme used and created by Tassilo Horn.") + +(custom-theme-set-faces + 'dev-tsdh-light + '(default ((t (:background "white" :foreground "black")))) + '(diff-added ((t (:inherit diff-changed :background "light green")))) + '(diff-changed ((t (:background "light steel blue")))) + '(diff-indicator-added ((t (:inherit diff-indicator-changed)))) + '(diff-indicator-changed ((t (:weight bold)))) + '(diff-indicator-removed ((t (:inherit diff-indicator-changed)))) + '(diff-removed ((t (:inherit diff-changed :background "sandy brown")))) + '(hl-line ((t (:background "grey95")))) + '(minibuffer-prompt ((t (:background "yellow" :foreground "medium blue" :box (:line-width -1 :color "red" :style released-button) :weight bold)))) + '(mode-line ((t (:box (:line-width -1 :color "red" :style released-button) :family "DejaVu Sans")))) + '(mode-line-inactive ((t (:inherit mode-line :foreground "dim gray")))) + '(org-agenda-date ((t (:inherit org-agenda-structure)))) + '(org-agenda-date-today ((t (:inherit org-agenda-date :underline t)))) + '(org-agenda-date-weekend ((t (:inherit org-agenda-date :foreground "dark green")))) + '(org-agenda-structure ((t (:foreground "Blue1" :weight bold :height 1.1 :family "DeJaVu Sans")))) + '(org-hide ((t (:foreground "white")))) + '(org-tag ((t (:weight bold)))) + '(outline-1 ((t (:inherit font-lock-function-name-face :weight bold)))) + '(outline-2 ((t (:inherit font-lock-variable-name-face :weight bold)))) + '(outline-3 ((t (:inherit font-lock-keyword-face :weight bold)))) + '(outline-4 ((t (:inherit font-lock-comment-face :weight bold)))) + '(outline-5 ((t (:inherit font-lock-type-face :weight bold)))) + '(outline-6 ((t (:inherit font-lock-constant-face :weight bold)))) + '(outline-7 ((t (:inherit font-lock-builtin-face :weight bold)))) + '(outline-8 ((t (:inherit font-lock-string-face :weight bold)))) + '(region ((t (:background "lightgoldenrod1")))) + '(show-paren-match ((t (:background "LightCyan2")))) + '(show-paren-mismatch ((t (:background "deep pink")))) + '(window-number-face ((t (:foreground "red" :weight bold))))) + +(provide-theme 'dev-tsdh-light) +