# HG changeset patch
# User aidan
# Date 1185448508 0
# Node ID 6f05405e63fc49e34d91256b0d3657394358f6cc
# Parent  52d406aab70ccea4e3bd6a8fd7b9e1ef978921ad
[xemacs-hg @ 2007-07-26 11:15:04 by aidan]
Fix the union build; thank you Robert Delius Royar.

diff -r 52d406aab70c -r 6f05405e63fc src/ChangeLog
--- a/src/ChangeLog	Wed Jul 25 21:51:21 2007 +0000
+++ b/src/ChangeLog	Thu Jul 26 11:15:08 2007 +0000
@@ -1,3 +1,10 @@
+2007-07-26  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* mule-ccl.c (ccl_driver):
+	op is an integer, not a Lisp_Object; don't use it to temporarily
+	store a Lisp_Object. This change fixes the union build; thank you
+	for the report, Robert Delius Royar. 
+
 2007-07-23  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* text.c:
diff -r 52d406aab70c -r 6f05405e63fc src/mule-ccl.c
--- a/src/mule-ccl.c	Wed Jul 25 21:51:21 2007 +0000
+++ b/src/mule-ccl.c	Thu Jul 26 11:15:08 2007 +0000
@@ -1562,10 +1562,9 @@
 
 		if (!HTENTRY_CLEAR_P(e))
 		  {
-                    op = e->value;
-		    if (!INTP (op))
+		    if (!INTP (e->value))
 		      CCL_INVALID_CMD;
-		    reg[RRR] = XCHAR_OR_INT (op);
+		    reg[RRR] = XCHAR_OR_INT (e->value);
 		    reg[7] = 1; /* r7 true for success */
 		  }
 		else