diff --git a/C/iopreds.c b/C/iopreds.c
index 61e8de078..82aa95c46 100644
--- a/C/iopreds.c
+++ b/C/iopreds.c
@@ -4715,20 +4715,20 @@ p_write_depth (void)
     return (FALSE);
   if (IsVarTerm (t1))
     {
-      Term t = MkIntTerm (*max_depth);
+      Term t = MkIntTerm (max_depth);
       if (!Yap_unify_constant(ARG1, t))
 	return (FALSE);
     }
   else
-    *max_depth = IntOfTerm (t1);
+    max_depth = IntOfTerm (t1);
   if (IsVarTerm (ARG2))
     {
-      Term t = MkIntTerm (*max_list);
+      Term t = MkIntTerm (max_list);
       if (!Yap_unify_constant (ARG2, t))
 	return (FALSE);
     }
   else
-    *max_list = IntOfTerm (t2);
+    max_list = IntOfTerm (t2);
   return (TRUE);
 }
 
diff --git a/C/write.c b/C/write.c
index 43175c165..ef3fd11e6 100644
--- a/C/write.c
+++ b/C/write.c
@@ -364,7 +364,7 @@ writeTerm(Term t, int p, int depth, int rinfixarg)
 	                  	/* context priority			 */
 	                      
 {
-  if (*max_depth != 0 && depth > *max_depth) {
+  if (max_depth != 0 && depth > max_depth) {
     putAtom(Yap_LookupAtom("..."));
     return;
   }
@@ -423,7 +423,7 @@ writeTerm(Term t, int p, int depth, int rinfixarg)
 	int             new_depth = depth + 1;
 	long            sl= 0;
 
-	if (*max_list && eldepth > *max_list) {
+	if (max_list && eldepth > max_list) {
 	  putAtom(Yap_LookupAtom("..."));
 	  wrputc(']');
 	  lastw = separator;
diff --git a/H/Heap.h b/H/Heap.h
index 10baf1b62..109c57851 100644
--- a/H/Heap.h
+++ b/H/Heap.h
@@ -10,7 +10,7 @@
 * File:		Heap.h         						 *
 * mods:									 *
 * comments:	Heap Init Structure					 *
-* version:      $Id: Heap.h,v 1.34 2002-11-11 17:37:58 vsc Exp $	 *
+* version:      $Id: Heap.h,v 1.35 2002-11-20 15:04:35 vsc Exp $	 *
 *************************************************************************/
 
 /* information that can be stored in Code Space */
@@ -128,7 +128,7 @@ typedef struct various_codes {
   struct pred_entry   *compiler_current_pred;
   AtomHashEntry invisiblechain;
   OPCODE dummycode;
-  Int maxdepth, maxlist;
+  UInt maxdepth, maxlist;
   int update_mode;
   Atom atprompt;
   char prompt[MAX_PROMPT];
@@ -361,8 +361,8 @@ typedef struct various_codes {
 #define  DUMMYCODE                (&(heap_regs->dummycode                ))
 #define  CLAUSECODE               (&(heap_regs->clausecode               ))
 #define  INVISIBLECHAIN           heap_regs->invisiblechain
-#define  max_depth                (&(heap_regs->maxdepth   	         ))
-#define  max_list                 (&(heap_regs->maxlist                  ))
+#define  max_depth                heap_regs->maxdepth
+#define  max_list                 heap_regs->maxlist
 #define  AtPrompt                 (&(heap_regs->atprompt    	         ))
 #define  Prompt                   heap_regs->prompt
 #if USE_THREADED_CODE
diff --git a/console/yap.c b/console/yap.c
index 6a0a793ca..f0b3f79a5 100644
--- a/console/yap.c
+++ b/console/yap.c
@@ -147,7 +147,6 @@ do_bootfile (char *bootfilename)
   YAP_Functor functor_query = YAP_MkFunctor(YAP_LookupAtom("?-"),1);
 
 
-  fprintf(stderr,"Entering Yap\n");
   /* consult boot.pl */
   bootfile = fopen (bootfilename, "r");
   if (bootfile == NULL)
@@ -491,7 +490,6 @@ main (int argc, char **argv)
   int BootMode;
   YAP_init_args init_args;
 
-  fprintf(stderr,"Entering YAP\n");
 #ifdef SIMICS
   fprintf(stdout,"Entering YAP\n");
 #endif /* SIMICS */
diff --git a/docs/yap.tex b/docs/yap.tex
index 24cbdeeb6..9f3be5651 100644
--- a/docs/yap.tex
+++ b/docs/yap.tex
@@ -8784,11 +8784,7 @@ variable. In the latter case, YAP discards previous values for the
 attributes.
 @item The built-in @code{get_atts/2} can be used to check the values of
 an attribute associated with a variable.
-<<<<<<< yap.tex
 @item The unification algorithm calls the user-defined predicate
-=======
-@item The unification algoritm calls the user-defined predicate
->>>>>>> 1.89
 @t{verify_attributes/3} before trying to bind an attributed
 variable. Unification will resume after this call.
 @item The user-defined predicate
@@ -11691,8 +11687,8 @@ prints the current rule instantiated by the matched constraints. Example:
 While in the debugger, a @dfn{printdepth} is in effect for limiting
 the subterm nesting level when printing rules and constraints.
 The limit is initially 10.  This command, without arguments, resets the
-limit to 10.  With an argument of @var{n}, the limit is set to @var{n},
-treating 0 as infinity.
+limit to 10.  With an argument of @var{n}, the limit is set to
+@var{n}. An argument @var{n} of 0 disables depth limit in the debugger.
 @refill
 
 @item a
diff --git a/pl/debug.yap b/pl/debug.yap
index 93fc4289b..fafecd335 100644
--- a/pl/debug.yap
+++ b/pl/debug.yap
@@ -792,13 +792,13 @@ debugging :-
 	        '$set_value'(debug,0),
 	        '$get_value'('$trace',OldTrace),
 	        '$set_value'('$trace',0),
-		('$pred_being_spied'(G,Module) -> write(user_error,'*') ; write(user_error,' ')),
-		( SL = L -> write(user_error,'>') ; write(user_error,' ')),
-		write(user_error,' ('), write(user_error,L), write(user_error,') '),
-		write(user_error,P), write(user_error,': '),
+		('$pred_being_spied'(G,Module) -> CSPY = '*' ; CSPY = ' '),
+		( SL = L -> SLL = '>' ; SLL = ' '),
 		( Module\=prolog,
-		  Module\=user -> write(user_error,Module),write(user_error,':');
-		   true
+		  Module\=user ->
+		    '$format'(user_error,"~a~a (~d) ~a: ~a:",[CSPY,SLL,L,P,Module]),
+		    ;
+		    '$format'(user_error,"~a~a (~d) ~a:",[CSPY,SLL,L,P]),
 		),
 		'$debugger_write'(user_error,G),
 	        '$set_value'(debug,1),