CVS update by aidan packages/mule-packages/mule-ucs/lisp, un-define.el ...

[xemacs-cvs at xemacs.org]

  User: aidan   
  Date: 07/08/08 22:45:14

  Modified:    packages/mule-packages/mule-ucs/lisp ChangeLog trans-util.el
                        un-define.el
Log:
Make the Mule-UCS CCL code a little saner, fixing the build after the recent
21.5 CCL changes.

Revision  Changes    Path
1.11      +9 -0      XEmacs/packages/mule-packages/mule-ucs/lisp/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-ucs/lisp/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ChangeLog	2005/06/19 21:18:03	1.10
+++ ChangeLog	2007/08/08 20:45:11	1.11
@@ -1,3 +1,12 @@
+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.
+
 2004-09-06  ARISAWA Akihiro  <ari at nijino.com>
 
 	* reldata/usupple.el (unicode-assoc-for-windows): Fixed codepoint



1.2       +3 -0      XEmacs/packages/mule-packages/mule-ucs/lisp/trans-util.el

Index: trans-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-ucs/lisp/trans-util.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- trans-util.el	2001/12/12 11:35:56	1.1
+++ trans-util.el	2007/08/08 20:45:11	1.2
@@ -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))



1.5       +0 -6      XEmacs/packages/mule-packages/mule-ucs/lisp/un-define.el

Index: un-define.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-ucs/lisp/un-define.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- un-define.el	2005/05/05 17:23:10	1.4
+++ un-define.el	2007/08/08 20:45:11	1.5
@@ -854,12 +854,6 @@ by calling post-read-conversion and pre-
 
 ) ;; 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