2 files changed, 21 insertions, 3 deletions
diff --git a/scheme/racket/geiser/images.rkt b/scheme/racket/geiser/images.rkt
index ddc0286..2cdcadb 100644
--- a/scheme/racket/geiser/images.rkt
+++ b/scheme/racket/geiser/images.rkt
@@ -1,6 +1,6 @@
 ;;; images.rkt -- support for image handline
 
-;; Copyright (C) 2012 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2012, 2014 Jose Antonio Ortega Ruiz
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the Modified BSD License. You should
@@ -14,7 +14,10 @@
 #lang racket/base
 
 (require racket/file file/convertible racket/pretty)
-(provide image-cache maybe-print-image maybe-write-image)
+(provide image-cache
+         maybe-print-image
+         maybe-write-image
+         make-port-print-handler)
 
 (define image-cache
   (let ([ensure-dir (lambda (dir)
@@ -44,3 +47,7 @@
 
 (define (maybe-write-image value)
   (write (or (maybe-save-image value) value)))
+
+(define (make-port-print-handler ph)
+  (lambda (value port . rest)
+    (apply ph (or (maybe-save-image value) value) port rest)))
diff --git a/scheme/racket/geiser/user.rkt b/scheme/racket/geiser/user.rkt
index a35574b..c566309 100644
--- a/scheme/racket/geiser/user.rkt
+++ b/scheme/racket/geiser/user.rkt
@@ -119,12 +119,22 @@
 
 (define (geiser-loader) (module-loader (current-load/use-compiled)))
 
+(define (install-print-handler handler)
+  (let ([p (current-output-port)])
+    (handler p (make-port-print-handler (handler p)))))
+
+(define (install-print-handlers)
+  (for-each install-print-handler (list port-print-handler
+                                        port-write-handler
+                                        port-display-handler)))
+
 (define (init-geiser-repl)
   (compile-enforce-module-constants #f)
   (current-load/use-compiled (geiser-loader))
   (preload-help)
   (current-prompt-read (geiser-prompt-read geiser-prompt))
-  (current-print maybe-print-image))
+  (current-print maybe-print-image)
+  (install-print-handlers))
 
 (define (run-geiser-repl in out enforce-module-constants)
   (parameterize [(compile-enforce-module-constants enforce-module-constants)
@@ -134,6 +144,7 @@
                  (current-load/use-compiled (geiser-loader))
                  (current-prompt-read (geiser-prompt-read geiser-prompt))
                  (current-print maybe-print-image)]
+    (install-print-handlers)
     (preload-help)
     (read-eval-print-loop)))