[Openmcl-cvs-notifications] r15242 - in /release/1.8/source: ./ cocoa-ide/cocoa-editor.lisp

[rme at clozure.com]

Author: rme
Date: Fri Mar  9 13:51:28 2012
New Revision: 15242

Log:
r15228 from trunk

Modified:
    release/1.8/source/   (props changed)
    release/1.8/source/cocoa-ide/cocoa-editor.lisp

Propchange: release/1.8/source/
---------------------------------------------------------------------------=
---
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  9 13:51:28 2012
@@ -4,4 +4,4 @@
 /branches/rme-logops:13875-13886
 /branches/working-0711/ccl:7970-13192,13197-13198,13202,13208,13214,13235-=
13236,13239,13263,13277-13278,13290,13293-13294,13302-13306,13331-13332,133=
39,13361-13364,13379,13383,13386,13388,13409,13435-13436,13438,13440-13442,=
13460-13461,13465,13467,13476,13487,13490,13492-13493,13502-13528,13545-135=
47,13549,13557-13558
 /release/1.5/source:13667
-/trunk/source:15221-15223,15225-15226
+/trunk/source:15221-15223,15225-15226,15228

Modified: release/1.8/source/cocoa-ide/cocoa-editor.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.8/source/cocoa-ide/cocoa-editor.lisp (original)
+++ release/1.8/source/cocoa-ide/cocoa-editor.lisp Fri Mar  9 13:51:28 2012
@@ -3502,8 +3502,14 @@
 (defun hemlock-ext:execute-in-file-view (pathname thunk)
   (execute-in-gui #'(lambda ()
                       (assume-cocoa-thread)
-                      (let ((view (find-or-make-hemlock-view pathname)))
-                        (hi::handle-hemlock-event view thunk)))))
+                      (handler-case
+                          (let ((view (find-or-make-hemlock-view pathname)=
))
+                            (hi::handle-hemlock-event view thunk))
+                        (error (c)
+                          (alert-window :title "Error in Hemlock command p=
rocessing"
+                                        :message (or (ignore-errors (princ=
-to-string c))
+                                                     "#<error printing err=
or message>")
+                                        :default-button "Ok"))))))
 =

 (defun hemlock-ext:open-sequence-dialog (&key title sequence action (print=
er #'prin1))
   (make-instance 'sequence-window-controller