From 7ce8a2c40ebc57988528362f47fd7cb03a3c9316 Mon Sep 17 00:00:00 2001
From: dlichteblau <dlichteblau>
Date: Sun, 1 Jul 2007 12:16:43 +0000
Subject: [PATCH] Patch by Christophe Rhodes on closure-devel
 <87ejk2sngi.fsf@cantab.net>

---
 src/gui/clim-gui.lisp       | 9 ++++++---
 src/renderer/renderer2.lisp | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/gui/clim-gui.lisp b/src/gui/clim-gui.lisp
index 93156f6..82fcdba 100644
--- a/src/gui/clim-gui.lisp
+++ b/src/gui/clim-gui.lisp
@@ -4,7 +4,7 @@
 ;;;   Created: 2002-07-22
 ;;;    Author: Gilbert Baumann <gilbert@base-engineering.com>
 ;;;   License: MIT style (see below)
-;;;       $Id: clim-gui.lisp,v 1.32 2007-06-30 14:00:04 dlichteblau Exp $
+;;;       $Id: clim-gui.lisp,v 1.33 2007-07-01 12:16:43 dlichteblau Exp $
 ;;; ---------------------------------------------------------------------------
 ;;;  (c) copyright 2002 by Gilbert Baumann
 
@@ -28,7 +28,10 @@
 ;;;  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ;; $Log: clim-gui.lisp,v $
-;; Revision 1.32  2007-06-30 14:00:04  dlichteblau
+;; Revision 1.33  2007-07-01 12:16:43  dlichteblau
+;; Patch by Christophe Rhodes on closure-devel <87ejk2sngi.fsf@cantab.net>
+;;
+;; Revision 1.32  2007/06/30 14:00:04  dlichteblau
 ;; New argument new-process to run-closure, which can be disabled to run
 ;; closure in a "blocking" mode.  Needed for clbuild, which wants to (quit)
 ;; after the application is done.
@@ -579,7 +582,7 @@
       (send-closure-command 'com-quit))))
 
 (defvar *closure-inited-p* nil)
-(defmethod clim:read-frame-command :before ((frame closure)
+(defmethod clim:run-frame-top-level :before ((frame closure)
                                                &key &allow-other-keys)
   (unless *closure-inited-p*
     (setf *closure-inited-p* t)))
diff --git a/src/renderer/renderer2.lisp b/src/renderer/renderer2.lisp
index 14a1f3d..5f755ea 100644
--- a/src/renderer/renderer2.lisp
+++ b/src/renderer/renderer2.lisp
@@ -4,7 +4,7 @@
 ;;;   Created: somewhen late 2002
 ;;;    Author: Gilbert Baumann <gilbert@base-engineering.com>
 ;;;   License: MIT style (see below)
-;;;       $Id: renderer2.lisp,v 1.19 2007-01-05 23:10:33 emarsden Exp $
+;;;       $Id: renderer2.lisp,v 1.20 2007-07-01 12:16:44 dlichteblau Exp $
 ;;; ---------------------------------------------------------------------------
 ;;;  (c) copyright 1997-2003 by Gilbert Baumann
 
@@ -1196,7 +1196,7 @@ mounted floating boxen."
 (defun format-block (item x1 x2 ss before-markers #||# pos-vertical-margin neg-vertical-margin yy)
   (let (res)
     (setf (block-box-output-record item)
-          (clim:with-new-output-record (clim-user::*pane*) foo
+          (clim:with-new-output-record (clim-user::*pane*) #+nil foo
               (setf res
                     (multiple-value-list
                         (case (cooked-style-display (block-box-style item))
@@ -4983,7 +4983,10 @@ border-spacing between the spaned columns is included."
 
 
 ;; $Log: renderer2.lisp,v $
-;; Revision 1.19  2007-01-05 23:10:33  emarsden
+;; Revision 1.20  2007-07-01 12:16:44  dlichteblau
+;; Patch by Christophe Rhodes on closure-devel <87ejk2sngi.fsf@cantab.net>
+;;
+;; Revision 1.19  2007/01/05 23:10:33  emarsden
 ;; Fix rendering of preformatted content.
 ;;
 ;; Revision 1.18  2007/01/05 11:19:30  crhodes
-- 
2.11.4.GIT