File format-info.patch of Package xemacs-packages

Index: packages/XEmacs.rules
===================================================================
--- packages/XEmacs.rules.orig
+++ packages/XEmacs.rules
@@ -278,31 +278,31 @@ html: $(HTML_DEP)
 
 XEMACS_BATCH_PREPARE_FOR_TEXINFO = $(XEMACS_BATCH_CLEAN) -eval '(setq load-path (append (list "$(XEMACS_PACKAGES_BASE)/xemacs-packages/texinfo" "$(XEMACS_PACKAGES_BASE)/xemacs-packages/text-modes" "$(XEMACS_PACKAGES_BASE)/xemacs-packages/xemacs-base") load-path))' $(LOAD_AUTOLOADS)
 
-FORMAT_INFO_USING_XEMACS_ARGS = -l informat -l texinfmt -f texinfo-format-buffer
+FORMAT_INFO_USING_XEMACS_ARGS = -l regexp-opt -l informat -l texinfmt -f texinfo-format-buffer 
 
 FORMAT_INFO_USING_XEMACS = \
 	$(XEMACS_BATCH_PREPARE_FOR_TEXINFO) -insert $< \
-	$(FORMAT_INFO_USING_XEMACS_ARGS) -f save-buffer
+	$(FORMAT_INFO_USING_XEMACS_ARGS) -eval '(setq file-coding-system (quote utf-8))' -eval '(save-buffer 0)' 
 
 FORMAT_MULE_INFO_USING_XEMACS = \
 	$(XEMACS_BATCH_PREPARE_FOR_TEXINFO) -insert $< \
 		-eval '(unless (featurep (quote mule)) (kill-emacs 0))' \
 		-eval '(cd "$(<D)")' \
 		$(FORMAT_INFO_USING_XEMACS_ARGS) \
-		-eval '(setq file-coding-system (quote iso-2022-7))' \
+		-eval '(setq file-coding-system (quote utf-8))' \
 		-eval '(save-buffer 0)'
 
 # makeinfo doesn't seem able to handle Mule-formatted files correctly, so
 # we need to use the texinfo package. #### Switch to UTF-8 and this should
 # go away.
-ifeq ($(COMPILE_INFO_AS_MULE),t)
-FORMAT_INFO = $(FORMAT_MULE_INFO_USING_XEMACS)
-else
+# ifeq ($(COMPILE_INFO_AS_MULE),t)
+# FORMAT_INFO = $(FORMAT_MULE_INFO_USING_XEMACS)
+# else
 FORMAT_INFO = cd $(@D) && $(MAKEINFO) $(MAKEINFO_FLAGS) -o $(@F) $(<F)
-endif
+# endif
 
 %-ja.info: %-ja.texi
-	$(FORMAT_MULE_INFO_USING_XEMACS)
+	$(FORMAT_INFO)
 
 %.info: %.txi
 	$(FORMAT_INFO)