Index: /branches/working-0711/ccl/level-1/l1-init.lisp
===================================================================
--- /branches/working-0711/ccl/level-1/l1-init.lisp	(revision 12944)
+++ /branches/working-0711/ccl/level-1/l1-init.lisp	(revision 12945)
@@ -261,5 +261,5 @@
 (defparameter *save-definitions* nil)
 (defparameter *save-local-symbols* t)
-(defparameter *save-source-locations* :no-text
+(defparameter *save-source-locations* T
   "Controls whether complete source locations is stored, both for definitions (names) and
 in function objects.
Index: /branches/working-0711/ccl/lib/compile-ccl.lisp
===================================================================
--- /branches/working-0711/ccl/lib/compile-ccl.lisp	(revision 12944)
+++ /branches/working-0711/ccl/lib/compile-ccl.lisp	(revision 12945)
@@ -516,9 +516,10 @@
 (defparameter *known-optional-features* '(:count-gf-calls :monitor-futex-wait :unique-dcode))
 (defvar *build-time-optional-features* nil)
-
-
-(defun rebuild-ccl (&key update full clean kernel force (reload t) exit reload-arguments verbose optional-features)
+(defvar *ccl-save-source-locations* :no-text)
+
+(defun rebuild-ccl (&key update full clean kernel force (reload t) exit reload-arguments verbose optional-features (save-source-locations *ccl-save-source-locations*))
   (let* ((*build-time-optional-features* (intersection *known-optional-features* optional-features))
-         (*features* (append *build-time-optional-features* *features*)))
+         (*features* (append *build-time-optional-features* *features*))
+	 (*save-source-locations* save-source-locations))
     (when *build-time-optional-features*
       (setq full t))
Index: /branches/working-0711/ccl/lib/prepare-mcl-environment.lisp
===================================================================
--- /branches/working-0711/ccl/lib/prepare-mcl-environment.lisp	(revision 12944)
+++ /branches/working-0711/ccl/lib/prepare-mcl-environment.lisp	(revision 12945)
@@ -53,6 +53,7 @@
   "Arrange that the outermost special bindings of *PACKAGE* and
 *WARN-IF-REDEFINE-KERNEL* restore values of the CL-USER package and T
-respectively. If the optional argument is true, marks all globally
-defined functions and methods as being predefined (this is a fairly
+respectively, and set *CCL-SAVE-SOURCE-LOCATIONS* to :NO-TEXT.
+If the optional argument is true, marks all globally defined
+functions and methods as being predefined (this is a fairly
 expensive operation.)"
   (when freeze-definitions
@@ -61,12 +62,13 @@
   (%reset-outermost-binding '*warn-if-redefine-kernel* t)
   ;; Set the top-level *package* to the CL-USER package
-  (%reset-outermost-binding '*package* (find-package "CL-USER")))
+  (%reset-outermost-binding '*package* (find-package "CL-USER"))
+  (setq *ccl-save-source-locations* :NO-TEXT))
 
 (defun set-development-environment (&optional (thaw-definitions nil))
   "Arrange that the outermost special bindings of *PACKAGE* and
 *WARN-IF-REDEFINE-KERNEL* restore values of the CCL package and NIL
-respectively. If the optional argument is true, mark all globally
-defined functions and methods as being not predefined (this is a
-fairly expensive operation.)"
+respectively, and set *ccl-save-source-locations* to T. If the
+optional argument is true, mark all globally defined functions and
+methods as being not predefined (this is a fairly expensive operation.)"
   (when thaw-definitions
     (thaw-current-definitions))
@@ -74,5 +76,6 @@
   (%reset-outermost-binding '*warn-if-redefine-kernel* nil)
   ;; Set the top-level *package* to the CCL package
-  (%reset-outermost-binding '*package* (find-package "CCL")))
+  (%reset-outermost-binding '*package* (find-package "CCL"))
+  (setq *ccl-save-source-locations* T))