charset-after may be undefined.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c1eb9a2..de0ef1d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+1999-12-12 10:17:42  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+       * mm-util.el (mm-charset-after): `charset-after' may not be defined.
+
 1999-12-12  Florian Weimer  <fw@s.netic.de>
 
        * rfc2047.el (rfc2047-encodable-p): New parameter header used to

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 22a4b76..265cb86 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -213,7 +213,9 @@ used as the line break code type of the coding system."
 If POS is nil, it defauls to the current point.
 If POS is out of range, the value is nil.
 If the charset is `composition', return the actual one."
-  (let ((charset (charset-after pos)))
+  (let ((charset (if (fboundp 'charset-after)
+                    (charset-after pos)
+                  (char-charset (char-after pos)))))
     (if (eq charset 'composition)
        (let ((p (or pos (point))))
          (cadr (find-charset-region p (1+ p))))