diff --git a/code/debug-int.lisp b/code/debug-int.lisp
index 05190e6cf40a3460e78ec26ba76c27769b13c6bd..bd7cfe69247e188130fe91e89f502c07ad273e62 100644
--- a/code/debug-int.lisp
+++ b/code/debug-int.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/debug-int.lisp,v 1.103 2003/05/11 08:57:13 gerd Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug-int.lisp,v 1.104 2003/07/21 13:41:53 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -3855,7 +3855,7 @@
     (compiled-debug-function
      (eq (c::compiled-debug-function-returns
 	  (compiled-debug-function-compiler-debug-fun what))
-	 :what))))
+	 :standard))))
 
 ;;; These are unique objects created upon entry into a function by a
 ;;; :function-end breakpoint's starter hook.  These are only created when users
diff --git a/code/ntrace.lisp b/code/ntrace.lisp
index 490ba8e979c5d456bcb45b4c04a9e33cd15bc6d0..9ee0db23441d7a5d9e4dd2d264adc69f6475e916 100644
--- a/code/ntrace.lisp
+++ b/code/ntrace.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/ntrace.lisp,v 1.27 2003/06/18 09:23:11 gerd Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/ntrace.lisp,v 1.28 2003/07/21 13:41:53 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -422,7 +422,7 @@
 	   (encapsulated
 	    (if (eq (trace-info-encapsulated info) :default)
 		(let ((encapsulate-p
-		       (or (di::can-set-function-end-breakpoint-p debug-fun)
+		       (or (not (di::can-set-function-end-breakpoint-p debug-fun))
 			   (encapsulate-by-package-p function-or-name))))
 		  (ecase kind
 		    (:compiled