diff --git a/collects/mred/edit.ss b/collects/mred/edit.ss
index 62061ac7..25d6c48d 100644
--- a/collects/mred/edit.ss
+++ b/collects/mred/edit.ss
@@ -4,7 +4,8 @@
 
 (module edit mzscheme
   (require (lib "class.ss")
-	   (lib "mred.ss" "mred"))
+	   (lib "mred.ss" "mred")
+	   (lib "etc.ss"))
 
   (provide new-text-frame
 	   new-pasteboard-frame
@@ -13,143 +14,144 @@
   (define (new-text-frame file) (new-frame text% file))
   (define (new-pasteboard-frame file) (new-frame pasteboard% file))
 
-  (define (new-frame editor% file)
-    (define f (make-object (class frame%
-			     (inherit modified)
-			     (define/override (can-close?)
-			       (and (super can-close?)
-				    (or (not (modified))
-					(let ([r (message-box/custom
-						  "Editor Modified"
-						  "The editor has been modified. Really close it?"
-						  "Close"
-						  "Cancel"
-						  "Save and Close"
-						  this
-						  '(default=2 disallow-close))])
-					  (or (and (= r 3)
-						   (send e save-file))
-					      (= r 1))))))
-			     (super-new))
-			   "MrEdIt" #f 620 450))
-    (define c (make-object editor-canvas% f))
-    (define e (make-object (class editor%
-			     (define/override (set-modified mod?)
-			       (send f modified mod?)
-			       (super set-modified mod?))
-			     (super-new))))
-    (define mb (make-object menu-bar% f))
+  (define new-frame
+    (opt-lambda (editor% file [editor-canvas% editor-canvas%])
+      (define f (make-object (class frame%
+			       (inherit modified)
+			       (define/augment (can-close?)
+				 (and (or (not (modified))
+					  (let ([r (message-box/custom
+						    "Editor Modified"
+						    "The editor has been modified. Really close it?"
+						    "Close"
+						    "Cancel"
+						    "Save and Close"
+						    this
+						    '(default=2 disallow-close))])
+					    (or (and (= r 3)
+						     (send e save-file))
+						(= r 1))))
+				      (inner #t can-close?)))
+			       (super-new))
+			     "MrEdIt" #f 620 450))
+      (define c (make-object editor-canvas% f))
+      (define e (make-object (class editor%
+			       (define/override (set-modified mod?)
+				 (send f modified mod?)
+				 (super set-modified mod?))
+			       (super-new))))
+      (define mb (make-object menu-bar% f))
 
-    (define file-menu (make-object menu% "File" mb))
-    (define edit-menu (make-object menu% "Edit" mb))
-    (define font-menu (make-object menu% "Font" mb))
-    (define para-menu (make-object menu% "Paragraph" mb))
+      (define file-menu (make-object menu% "File" mb))
+      (define edit-menu (make-object menu% "Edit" mb))
+      (define font-menu (make-object menu% "Font" mb))
+      (define para-menu (make-object menu% "Paragraph" mb))
 
-    (make-object menu-item% "New Text Frame" file-menu
-		 (lambda (item event) 
-		   (new-text-frame #f))
-		 #\N)
-    (make-object menu-item% "New Pasteboard Frame" file-menu
-		 (lambda (item event) 
-		   (new-pasteboard-frame #f)))
-
-    (make-object menu-item% "Open..." file-menu
-		 (lambda (item event) 
-		   (send e load-file ""))
-		 #\O)
-    (make-object menu-item% "Save As..." file-menu
-		 (lambda (item event) 
-		   (send e save-file ""))
-		 #\S)
-    (when (eq? editor% text%)
-      (make-object menu-item% "Save As Text..." file-menu
+      (make-object menu-item% "New Text Frame" file-menu
 		   (lambda (item event) 
-		     (send e save-file "" 'text))))
-    (make-object separator-menu-item% file-menu)
-    (make-object menu-item% "Print..." file-menu
-		 (lambda (item event)
-		   (send e print))
-		 #\P)
-    (make-object separator-menu-item% file-menu)
-    (make-object menu-item% "Close" file-menu
-		 (lambda (item event)
-		   (when (send f can-close?)
-		     (send f on-close)
-		     (send f show #f)))
-		 #\Q)
+		     (new-text-frame #f))
+		   #\N)
+      (make-object menu-item% "New Pasteboard Frame" file-menu
+		   (lambda (item event) 
+		     (new-pasteboard-frame #f)))
 
-    (append-editor-operation-menu-items edit-menu #f)
-    (when (eq? editor% text%)
-      (make-object separator-menu-item% edit-menu)
-      (make-object checkable-menu-item% "Wrap Lines" edit-menu
+      (make-object menu-item% "Open..." file-menu
+		   (lambda (item event) 
+		     (send e load-file ""))
+		   #\O)
+      (make-object menu-item% "Save As..." file-menu
+		   (lambda (item event) 
+		     (send e save-file ""))
+		   #\S)
+      (when (eq? editor% text%)
+	(make-object menu-item% "Save As Text..." file-menu
+		     (lambda (item event) 
+		       (send e save-file "" 'text))))
+      (make-object separator-menu-item% file-menu)
+      (make-object menu-item% "Print..." file-menu
 		   (lambda (item event)
-		     (send e auto-wrap (send item is-checked?)))))
+		     (send e print))
+		   #\P)
+      (make-object separator-menu-item% file-menu)
+      (make-object menu-item% "Close" file-menu
+		   (lambda (item event)
+		     (when (send f can-close?)
+		       (send f on-close)
+		       (send f show #f)))
+		   #\Q)
 
-    (append-editor-font-menu-items font-menu)
-    (let ([m (make-object menu% "Smoothing" font-menu)])
-      (let ([mk (lambda (name v)
-		  (make-object menu-item% name m
-			       (lambda (i e)
-				 (let* ([o (send f get-edit-target-object)])
-				   (and o
-					(o . is-a? . editor<%>)
-					(send o change-style 
-					      (make-object style-delta% 'change-smoothing v)))))))])
-	(mk "Default" 'default)
-	(mk "Partly Smoothed" 'partly-smoothed)
-	(mk "Smoothed" 'smoothed)
-	(mk "Not Smoothed" 'unsmoothed)))
+      (append-editor-operation-menu-items edit-menu #f)
+      (when (eq? editor% text%)
+	(make-object separator-menu-item% edit-menu)
+	(make-object checkable-menu-item% "Wrap Lines" edit-menu
+		     (lambda (item event)
+		       (send e auto-wrap (send item is-checked?)))))
 
-    (make-object menu-item% "Set Margins..." para-menu
-		 (lambda (i ev)
-		   (let* ([d (make-object dialog% "Margins" f)]
-			  [mk-txt (lambda (label) (make-object 
-						   text-field%
-						   label
-						   d
-						   void
-						   "0.0"))]
-			  [first-left (mk-txt "First Left")]
-			  [rest-left (mk-txt "Rest Left")]
-			  [right (mk-txt "Right")]
-			  [button-panel (new horizontal-pane% 
-					     [parent d]
-					     [alignment '(right center)])]
-			  [ok (make-object button% "Ok" button-panel
-					   (lambda (b ev)
-					     (let* ([get (lambda (field)
-							   (let ([n (string->number (send field get-value))])
-							     (and n (real? n) (not (negative? n)) n)))]
-						    [first-left (get first-left)]
-						    [rest-left (get rest-left)]
-						    [right (get right)])
-					       (if (and first-left
-							rest-left
-							right)
-						   (let ([start (send e position-paragraph
-								      (send e get-start-position))]
-							 [end  (send e position-paragraph
-								     (send e get-end-position))])
-						     (let loop ([i start])
-						       (unless (i . > . end)
-							 (send e set-paragraph-margins 
-							       i first-left rest-left right)
-							 (loop (add1 i)))
-						       (send d show #f)))
-						   (bell))))
-					   '(border))]
-			  [cancel (make-object button% "Cancel" button-panel
-					       (lambda (b e)
-						 (send d show #f)))])
-		     (send d show #t))))
+      (append-editor-font-menu-items font-menu)
+      (let ([m (make-object menu% "Smoothing" font-menu)])
+	(let ([mk (lambda (name v)
+		    (make-object menu-item% name m
+				 (lambda (i e)
+				   (let* ([o (send f get-edit-target-object)])
+				     (and o
+					  (o . is-a? . editor<%>)
+					  (send o change-style 
+						(make-object style-delta% 'change-smoothing v)))))))])
+	  (mk "Default" 'default)
+	  (mk "Partly Smoothed" 'partly-smoothed)
+	  (mk "Smoothed" 'smoothed)
+	  (mk "Not Smoothed" 'unsmoothed)))
 
-    ((current-text-keymap-initializer) (send e get-keymap))
-    (send c set-editor e)
+      (make-object menu-item% "Set Margins..." para-menu
+		   (lambda (i ev)
+		     (let* ([d (make-object dialog% "Margins" f)]
+			    [mk-txt (lambda (label) (make-object 
+						     text-field%
+						     label
+						     d
+						     void
+						     "0.0"))]
+			    [first-left (mk-txt "First Left")]
+			    [rest-left (mk-txt "Rest Left")]
+			    [right (mk-txt "Right")]
+			    [button-panel (new horizontal-pane% 
+					       [parent d]
+					       [alignment '(right center)])]
+			    [ok (make-object button% "Ok" button-panel
+					     (lambda (b ev)
+					       (let* ([get (lambda (field)
+							     (let ([n (string->number (send field get-value))])
+							       (and n (real? n) (not (negative? n)) n)))]
+						      [first-left (get first-left)]
+						      [rest-left (get rest-left)]
+						      [right (get right)])
+						 (if (and first-left
+							  rest-left
+							  right)
+						     (let ([start (send e position-paragraph
+									(send e get-start-position))]
+							   [end  (send e position-paragraph
+								       (send e get-end-position))])
+						       (let loop ([i start])
+							 (unless (i . > . end)
+							   (send e set-paragraph-margins 
+								 i first-left rest-left right)
+							   (loop (add1 i)))
+							 (send d show #f)))
+						     (bell))))
+					     '(border))]
+			    [cancel (make-object button% "Cancel" button-panel
+						 (lambda (b e)
+						   (send d show #f)))])
+		       (send d show #t))))
 
-    (when file
-      (if (regexp-match "[.](gif|bmp|jpe?g|xbm|xpm|png)$" file)
-	  (send e insert (make-object image-snip% file))
-	  (send e load-file file)))
-    
-    (send f show #t)
-    f))
+      ((current-text-keymap-initializer) (send e get-keymap))
+      (send c set-editor e)
+
+      (when file
+	(if (regexp-match "[.](gif|bmp|jpe?g|xbm|xpm|png)$" file)
+	    (send e insert (make-object image-snip% file))
+	    (send e load-file file)))
+      
+      (send f show #t)
+      f)))
diff --git a/collects/mred/mred.ss b/collects/mred/mred.ss
index 24a25772..9e0c8baf 100644
--- a/collects/mred/mred.ss
+++ b/collects/mred/mred.ss
@@ -4831,7 +4831,8 @@
   (interface (subwindow<%>)
     min-client-width min-client-height
     on-char on-event on-paint on-scroll on-tab-in
-    warp-pointer get-dc))
+    warp-pointer get-dc
+    set-canvas-background get-canvas-background))
 
 (define-keywords canvas%-keywords
   window%-keywords
@@ -4852,7 +4853,24 @@
 
       [warp-pointer (entry-point (lambda (x y) (send wx warp-pointer x y)))]
 
-      [get-dc (entry-point (lambda () (send wx get-dc)))])
+      [get-dc (entry-point (lambda () (send wx get-dc)))]
+
+      [set-canvas-background
+       (entry-point
+	(lambda (c)
+	  (unless (c . is-a? . wx:color%)
+	    (raise-type-error (who->name '(method canvas<%> set-canvas-background))
+			      "color% object"
+			      c))
+	  (unless (send wx get-canvas-background)
+	    (raise-mismatch-error (who->name '(method canvas<%> set-canvas-background))
+				  "cannot set a transparent canvas's background color: "
+				  c))
+	  (send wx set-canvas-background c)))]
+      [get-canvas-background
+       (entry-point
+	(lambda ()
+	  (send wx get-canvas-background)))])
     (private-field
       [wx #f])
     (sequence
@@ -4977,7 +4995,7 @@
       (let ([cwho '(constructor editor-canvas)])
 	(check-container-parent cwho parent)
 	(check-instance cwho internal-editor<%> "text% or pasteboard%" #t editor)
-	(check-style cwho #f '(hide-vscroll hide-hscroll no-vscroll no-hscroll deleted control-border) style)
+	(check-style cwho #f '(hide-vscroll hide-hscroll no-vscroll no-hscroll deleted control-border transparent) style)
 	(check-gauge-integer cwho scrolls-per-page)
 	(check-label-string/false cwho label)
 	(unless (eq? wheel-step no-val)
diff --git a/collects/mred/private/kernel.ss b/collects/mred/private/kernel.ss
index b446dcad..7ef48528 100644
--- a/collects/mred/private/kernel.ss
+++ b/collects/mred/private/kernel.ss
@@ -342,6 +342,8 @@
     on-size
     on-set-focus
     on-kill-focus
+    get-canvas-background
+    set-canvas-background
     set-background-to-gray
     on-scroll
     set-scroll-page
@@ -647,6 +649,8 @@
     on-kill-focus
     popup-for-editor
     call-as-primary-owner
+    get-canvas-background
+    set-canvas-background
     set-y-margin
     set-x-margin
     get-y-margin