CVS update by aidan xemacs/src ...

[xemacs-cvs at xemacs.org]

  User: aidan   
  Date: 07/07/26 13:15:12

  Modified:    xemacs/src ChangeLog mule-ccl.c
Log:
Fix the union build; thank you Robert Delius Royar.

Revision  Changes    Path
1.1077    +7 -0      XEmacs/xemacs/src/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1076
retrieving revision 1.1077
diff -u -p -r1.1076 -r1.1077
--- ChangeLog	2007/07/23 14:20:20	1.1076
+++ ChangeLog	2007/07/26 11:15:04	1.1077
@@ -1,3 +1,10 @@
+2007-07-26  Aidan Kehoe  <kehoea at 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 at parhasard.net>
 
 	* text.c:



1.33      +2 -3      XEmacs/xemacs/src/mule-ccl.c

Index: mule-ccl.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mule-ccl.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- mule-ccl.c	2007/07/22 22:04:14	1.32
+++ mule-ccl.c	2007/07/26 11:15:08	1.33
@@ -1562,10 +1562,9 @@ ccl_driver (struct ccl_program *ccl,
 
 		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