CVS update by aidan packages/mule-packages/mule-ucs/lisp, mucs-type.el ...

  User: aidan   
  Date: 09/10/01 22:50:15

  Modified:    packages/mule-packages/mule-ucs/lisp ChangeLog mucs-ccl.el
                        mucs-type.el mucs.el
Log:
Avoid compile-time-loading of mule/make-coding-system.el with 21.5, Mule-UC

Revision  Changes    Path
1.15      +14 -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.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ChangeLog	2009/10/01 19:27:11	1.14
+++ ChangeLog	2009/10/01 20:50:14	1.15
@@ -1,5 +1,19 @@
 2009-10-01  Aidan Kehoe  <[email protected]>
 
+	* mucs-type.el (mucs-make-coding-system): 
+	New macro, using #'make-coding-system-internal if that is
+	available, and #'make-coding-system if not. Avoids compile-time
+	loading of mule/make-coding-system.el on 21.5, which fails because
+	that file uses #'decode-char, broken by Mule-UCS.
+	* mucs-ccl.el (mucs-ccl-define-temporal-coding-system): 
+	Use the mucs-make-coding-system macro, not make-coding-system
+	directly.
+	* mucs.el (mucs-define-coding-system): 
+	Use the mucs-make-coding-system macro, not make-coding-system
+	directly.
+
+2009-10-01  Aidan Kehoe  <[email protected]>
+
 	* mucs-ccl.el (mucs-ccl-define-temporal-coding-system): 
 	Use the actual XEmacs syntax for #'make-coding-system system here,
 	when creating a CCL coding system. This fixes the package build on



1.3       +2 -1      XEmacs/packages/mule-packages/mule-ucs/lisp/mucs-ccl.el

Index: mucs-ccl.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-ucs/lisp/mucs-ccl.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mucs-ccl.el	2009/10/01 19:27:11	1.2
+++ mucs-ccl.el	2009/10/01 20:50:14	1.3
@@ -62,7 +62,8 @@
      (mucs-conversion-get conv 'mucs-compiled-code))
     (if (not (coding-system-p
 	      'mucs-ccl-temporary))
-	(make-coding-system
+        ;; Ugly, but compiles under 21.5. 
+	(mucs-make-coding-system
          'mucs-ccl-temporary 'ccl
          "Temporary coding-system privately used by MUCS-CCL"
 	 `(encode mucs-ccl-temp-ccl-prog



1.2       +5 -0      XEmacs/packages/mule-packages/mule-ucs/lisp/mucs-type.el

Index: mucs-type.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-ucs/lisp/mucs-type.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mucs-type.el	2001/12/12 11:35:59	1.1
+++ mucs-type.el	2009/10/01 20:50:14	1.2
@@ -75,6 +75,11 @@
 
 (defvar mucs-type-alist nil)
 
+(defmacro mucs-make-coding-system (&rest args)
+  `(funcall (if (fboundp 'make-coding-system-internal)
+                'make-coding-system-internal
+              'make-coding-system) ,@args))
+
 (defsubst mucs-type-p (type)
   (and (assq type mucs-type-alist)
        t))



1.4       +3 -3      XEmacs/packages/mule-packages/mule-ucs/lisp/mucs.el

Index: mucs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-ucs/lisp/mucs.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mucs.el	2005/05/08 14:40:55	1.3
+++ mucs.el	2009/10/01 20:50:15	1.4
@@ -455,7 +455,7 @@ Therefore, you can use these without any
 		     (t
 		      t)))
 	 `(or (find-coding-system ,symbol)
-	      (make-coding-system
+	      (mucs-make-coding-system
 	       ,symbol 'ccl ,doc-string
 	       (list 'decode ,decode-conversion
 		     'encode ,encode-conversion
@@ -464,13 +464,13 @@ Therefore, you can use these without any
 				 (char-to-string ,mnemonic))
 		     'eol-type ,eol-type))))
 	((mule-version-satisfied-p 4 1)
-	 `(make-coding-system
+	 `(mucs-make-coding-system
 	   ,symbol 4 ,mnemonic ,doc-string
 	   (cons ,decode-conversion
 		 ,encode-conversion)
 	   ,alist ,eol-type))
 	((featurep 'mule)
-	 `(make-coding-system
+	 `(mucs-make-coding-system
 	   ,symbol 4 ,mnemonic ,doc-string
 	   (cons ,decode-conversion
 		 ,encode-conversion)