From 2d50bf26e0671b02310c9a5b9795dbb6cd92e260 Mon Sep 17 00:00:00 2001 From: pmai <pmai> Date: Sun, 20 Jun 2004 17:00:36 +0000 Subject: [PATCH] Special case the processing of the -quiet command-line flag in order to ensure that its effects kick in early enough during startup, thus silencing loading of siteinit, siteinit-loaded files, etc. Reported by JBThiel against the OS X port. --- code/commandline.lisp | 14 ++------------ code/save.lisp | 10 +++++++++- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/code/commandline.lisp b/code/commandline.lisp index 5c44c4767..caf6910f0 100644 --- a/code/commandline.lisp +++ b/code/commandline.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/commandline.lisp,v 1.13 2003/01/29 19:47:47 toy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/commandline.lisp,v 1.14 2004/06/20 17:00:36 pmai Exp $") ;;; ;;; ********************************************************************** ;;; @@ -191,17 +191,6 @@ (load (cmd-switch-arg switch))) (defswitch "load" #'load-switch-demon) -(defun quiet-switch-demon (switch) - (declare (ignore switch)) - (setq *load-verbose* nil - *compile-verbose* nil - *compile-print* nil - *compile-progress* nil - *require-verbose* nil - *gc-verbose* nil - *herald-items* nil)) -(defswitch "quiet" #'quiet-switch-demon) - (defun cmd-switch-arg (switch) (or (cmd-switch-value switch) (car (cmd-switch-words switch)) @@ -215,3 +204,4 @@ (defswitch "batch") (defswitch "dynamic-space-size") (defswitch "lib") +(defswitch "quiet") diff --git a/code/save.lisp b/code/save.lisp index 460164def..5719cd4c0 100644 --- a/code/save.lisp +++ b/code/save.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/save.lisp,v 1.51 2003/06/18 09:23:10 gerd Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/save.lisp,v 1.52 2004/06/20 17:00:36 pmai Exp $") ;;; ;;; ********************************************************************** ;;; @@ -198,6 +198,14 @@ :test #'(lambda (x y) (declare (simple-string x y)) (string-equal x y))))) + (when (and process-command-line (find-switch "quiet")) + (setq *load-verbose* nil + *compile-verbose* nil + *compile-print* nil + *compile-progress* nil + *require-verbose* nil + *gc-verbose* nil + *herald-items* nil)) (when (and site-init (not (and process-command-line (find-switch "nositeinit")))) -- GitLab