File fix-mule-make-coding-system.patch of Package xemacs-packages
--- packages/mule-packages/Makefile
+++ packages/mule-packages/Makefile 2009-12-08 09:44:21.519929411 +0000
@@ -20,7 +20,7 @@ include ../Local.rules.inc
ifeq ('$(MULE_PACKAGES)','mule-packages')
PACKAGES := mule-base locale leim edict egg-its \
- mule-ucs latin-unity latin-euro-standards
+ latin-unity latin-euro-standards mule-ucs
else
PACKAGES := $(MULE_PACKAGES)
endif
--- packages/mule-packages/mule-ucs/lisp/mucs-ccl.el
+++ packages/mule-packages/mule-ucs/lisp/mucs-ccl.el 2009-12-07 16:56:34.835429498 +0000
@@ -62,11 +62,14 @@
(mucs-conversion-get conv 'mucs-compiled-code))
(if (not (coding-system-p
'mucs-ccl-temporary))
- (make-coding-system
- 'mucs-ccl-temporary
- 4 ?*
- "Temporary coding-system privately used by MUCS-CCL"
- '(mucs-ccl-tmp-ccl-prog . mucs-ccl-tmp-ccl-prog)))))
+ (mucs-make-coding-system
+ 'mucs-ccl-temporary 'ccl
+ "Temporary coding-system privately used by MUCS-CCL"
+ `(encode mucs-ccl-temp-ccl-prog
+ decode ,(ccl-compile
+ '(1 (loop
+ (read r0)
+ (write-repeat r0)))))))))
;;; CCL facility checker.
--- packages/mule-packages/mule-ucs/lisp/mucs-type.el
+++ packages/mule-packages/mule-ucs/lisp/mucs-type.el 2009-12-07 16:56:11.999950174 +0000
@@ -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))
--- packages/mule-packages/mule-ucs/lisp/mucs.el
+++ packages/mule-packages/mule-ucs/lisp/mucs.el 2009-12-07 16:54:37.883930107 +0000
@@ -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)