--- a/XWorkstation.st	Tue Oct 29 22:25:37 1996 +0100
+++ b/XWorkstation.st	Wed Oct 30 23:00:00 1996 +0100
@@ -172,31 +172,31 @@
 #define ISCONNECTED          (__INST(displayId) != nil)
 
 #ifndef THISCONTEXT_IN_REGISTER
+
 # define BEGIN_INTERRUPTSBLOCKED /* */
 # define END_INTERRUPTSBLOCKED /* */
+
 #else
+
 # define BEGIN_INTERRUPTSBLOCKED        \
     {                                   \
 	int needUnblock = 0;            \
-	extern OBJ __thisContext__;     \
 					\
-	__thisContext__ = __thisContext;\
+	__BEGIN_PROTECT_REGISTERS__     \
 	if (!__interruptsBlocked) {     \
 	    __BLOCKINTERRUPTS();        \
 	    needUnblock = 1;            \
 	}
 
 # define END_INTERRUPTSBLOCKED_NOW      \
-	__thisContext = __thisContext;  \
-	__thisContext__ = 0;            \
+	__END_PROTECT_REGISTERS__	\
 	if (needUnblock) {              \
 	    __UNBLOCKINTERRUPTS();      \
 	}                               \
     }
 
 # define END_INTERRUPTSBLOCKED		\
-	__thisContext = __thisContext;  \
-	__thisContext__ = 0;
+	__END_PROTECT_REGISTERS__
 
 #endif
 %}
@@ -8159,6 +8159,6 @@
 !XWorkstation  class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.180 1996-10-22 23:34:46 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.181 1996-10-30 22:00:00 cg Exp $'
 ! !
 XWorkstation initialize!