[COMMIT] Make the Mule-UCS CCL code a little saner.

[Aidan Kehoe]

APPROVE COMMIT

NOTE: This patch has been committed.

 Ar an t-ochtú lá de mí Lúnasa, scríobh Aidan Kehoe: 

 >  Ar an t-ochtú lá de mí Lúnasa, scríobh Mike FABIAN: 
 > 
 >  > Aidan Kehoe <kehoea at parhasard.net> さんは書きました:
 >  > 
 >  > >  Ar an t-ochtú lá de mí Lúnasa, scríobh Mike FABIAN: 
 >  > >
 >  > >  > Mike FABIAN <mfabian at suse.de> さんは書きました:
 >  > >  > 
 >  > >  > > As it fails in mule-ucs and mule-ucs isn't needed for XEmacs
 >  > >  > > 21.5.x anyway, maybe I could just disable the build of mule-ucs.
 >  > >  > 
 >  > >  > That is not so easy because mule-ucs seems to be required by
 >  > >  > latin-unity.
 >  > >
 >  > > I know what’s broken here; I’ll check in a change this evening. 
 >  > 
 >  > A change to the packages or to XEmacs?
 > 
 > To mule-ucs. 

Okay, this is that change. 

mule-packages/mule-ucs/lisp/ChangeLog addition:

2007-08-08  Aidan Kehoe  <kehoea at parhasard.net>

	* trans-util.el:
	Require ccl at compile time for the sake of the macro expansion of
	define-ccl-program.
	* un-define.el:
	Don't manipulate font-ccl-encode-alist; it's pointless in XEmacs
	21.4 and XEmacs 21.5.


XEmacs Packages source patch:
Diff command:   cvs -q diff -Nu
Files affected: mule-packages/mule-ucs/lisp/un-define.el
===================================================================
RCS mule-packages/mule-ucs/lisp/trans-util.el
===================================================================
RCS

Index: mule-packages/mule-ucs/lisp/trans-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-ucs/lisp/trans-util.el,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 trans-util.el
--- mule-packages/mule-ucs/lisp/trans-util.el	2001/12/12 11:35:56	1.1.1.1
+++ mule-packages/mule-ucs/lisp/trans-util.el	2007/08/08 20:43:28
@@ -24,6 +24,9 @@
 
 ;;; String to number translation functions
 
+;; This file is not compilable on a non-Mule emacs. 
+(eval-when-compile (require 'ccl))
+
 (defun string-to-number-with-radix (string radix)
   (let ((i 0)
 	(j (length string))
Index: mule-packages/mule-ucs/lisp/un-define.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-ucs/lisp/un-define.el,v
retrieving revision 1.4
diff -u -u -r1.4 un-define.el
--- mule-packages/mule-ucs/lisp/un-define.el	2005/05/05 17:23:10	1.4
+++ mule-packages/mule-ucs/lisp/un-define.el	2007/08/08 20:43:28
@@ -854,12 +854,6 @@
 
 ) ;; un-define package definition ends here
 
-
-;;; font encoder setup
-(add-to-list
- 'font-ccl-encoder-alist
- '("iso10646" . unicode-font-encoder))
-
 ; font encoder setup (for Meadow)
 (if (featurep 'meadow)
     (w32-regist-font-encoder

-- 
On the quay of the little Black Sea port, where the rescued pair came once
more into contact with civilization, Dobrinton was bitten by a dog which was
assumed to be mad, though it may only have been indiscriminating. (Saki)