[Fwd: [PATCH] packages: Define encode-mime-charset-string as function]

[Ville Skyttä]

Hello,

this patch to APEL was sent to xemacs-patches at xemacs.org, and has
already been committed to XEmacs CVS.  Please consider applying in APEL
CVS too.

There's a thread about the patch at
<http://list-archive.xemacs.org/xemacs-patches/200207/msg00127.html>.

Cheers, \/ille

-----Forwarded Message-----

From: Daiki Ueno <daiki at xemacs.org>
To: Adrian Aichner <adrian at xemacs.org>, xemacs-patches at xemacs.org
Subject: [PATCH] packages: Define encode-mime-charset-string as function
Date: 13 Jul 2002 18:36:56 +0900

>>>>> In <k7o03idc.fsf at smtprelay.T-Online.De> 
>>>>>	Adrian Aichner <Adrian.Aichner at t-online.de> wrote:

APA> Starting liece with
APA> M-x liece
APA> I get this:

APA> Signaling: (wrong-number-of-arguments mime-charset-to-coding-system 2)
APA>   mime-charset-to-coding-system(iso-8859-1 nil)
APA>   liece-coding-encode-charset-string("PING D5DC120J")

I think this is a bug of APEL.  The background is that Liece uses
encode-mime-charset-string, the function is defined seperately in APEL
(for MULE and non-MULE), and the version for MULE calls
mime-charset-to-coding-system with the second argument.  Unfortunately
if the package is compiled for MULE, encode-mime-charset-string is
inlined into bytecode here:

mcs-xm.el (for MULE):
(defsubst encode-mime-charset-string (string charset &optional lbt)

mcs-ltn1.el (for non-MULE):
(defun encode-mime-charset-string (string charset &optional lbt)

I'll attach the patch to fix this.  I rebuilt both APEL and Liece
packages (compiled for MULE) and I'm uploading them at:

http://deisui.org/~ueno/tmp/apel-1.23-pkg.tar.gz
http://deisui.org/~ueno/tmp/liece-1.06-pkg.tar.gz

Could you please confirm for me that the problem has gone away with
these packages?

xemacs-packages/apel/ChangeLog addition:

2002-07-13  Daiki Ueno  <daiki at xemacs.org>

	* mcs-xm.el (encode-mime-charset-string): Use `defun' instead of
	`defsubst'

xemacs-packages source patch:
Diff command:   cvs -q diff -u
Files affected: xemacs-packages/apel/mcs-xm.el

Index: xemacs-packages/apel/mcs-xm.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mcs-xm.el,v
retrieving revision 1.2
diff -u -F^( -u -r1.2 mcs-xm.el
--- xemacs-packages/apel/mcs-xm.el	2000/07/10 04:41:05	1.2
+++ xemacs-packages/apel/mcs-xm.el	2002/07/13 09:13:09
@@ -81,7 +81,7 @@ (defun decode-mime-charset-region (start
 		       (assq t mime-charset-decoder-alist)))))
     (funcall func start end charset lbt)))
 
-(defsubst encode-mime-charset-string (string charset &optional lbt)
+(defun encode-mime-charset-string (string charset &optional lbt)
   "Encode the STRING as MIME CHARSET."
   (let ((cs (mime-charset-to-coding-system charset lbt)))
     (if cs

-- 
Daiki Ueno
-- 
\/ille Skyttä