SUPERSEDES <16956.43223.980860.469559(a)parhasard.net>
Aidan, I'd suggest this one instead, with your ChangeLog.
Index: mm-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mm-util.el,v
retrieving revision 1.7
diff -u -u -r1.7 mm-util.el
--- mm-util.el 14 Mar 2005 02:26:20 -0000 1.7
+++ mm-util.el 19 Mar 2005 22:04:57 -0000
@@ -655,7 +655,7 @@
(defmacro mm-xemacs-find-mime-charset (begin end)
(when (featurep 'xemacs)
- `(mm-xemacs-find-mime-charset-1 ,begin ,end)))
+ `(and (featurep 'mule) (mm-xemacs-find-mime-charset-1 ,begin ,end))))
(defun mm-find-mime-charset-region (b e &optional hack-charsets)
"Return the MIME charsets needed to encode the region between B and E.
I compiled under Mule and sent an e-mail in Mule and non-Mule XEmacs.
Adrian
Aidan Kehoe <kehoea(a)parhasard.net> writes:
Ar an naoú lá déag de mà Márta, scrÃobh Adrian Aichner:
> This, however, won't work when
> (defmacro mm-xemacs-find-mime-charset (begin end)
> (when (and (featurep 'xemacs) (featurep 'mule))
> `(mm-xemacs-find-mime-charset-1 ,begin ,end)))
> is compiled by an XEmacs with Mule, which is the case for all
> officially distributed XEmacs packages, AFAIK.
Note to self; donât ever trust the Gnus people to test any XEmacs
changes. Okay, then, Iâve tested the below locally with a non-Mule
build. Does it work for you?
xemacs-packages/gnus/ChangeLog addition:
2005-03-19 Aidan Kehoe <kehoea(a)parhasard.net>
* lisp/mm-util.el (mm-xemacs-find-mime-charset): Only call
mm-xemacs-find-mime-charset-1 if we have the mule feature
available at runtime.
XEmacs Packages source patch:
Diff command: cvs -q diff -u
Files affected: xemacs-packages/gnus/lisp/mm-util.el
Index: xemacs-packages/gnus/lisp/mm-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mm-util.el,v
retrieving revision 1.7
diff -u -u -r1.7 mm-util.el
--- xemacs-packages/gnus/lisp/mm-util.el 2005/03/14 02:26:20 1.7
+++ xemacs-packages/gnus/lisp/mm-util.el 2005/03/19 21:25:26
@@ -655,7 +655,7 @@
(defmacro mm-xemacs-find-mime-charset (begin end)
(when (featurep 'xemacs)
- `(mm-xemacs-find-mime-charset-1 ,begin ,end)))
+ `(and (featurep 'mule) mm-xemacs-find-mime-charset-1 ,begin ,end)))
(defun mm-find-mime-charset-region (b e &optional hack-charsets)
"Return the MIME charsets needed to encode the region between B and E.
--
Adrian Aichner
mailto:adrian@xemacs.org
http://www.xemacs.org/