* nnheader.el (mm-disable-multibyte): New function.

(mm-enable-multibyte): New function.
(mm-encode-coding-region): New function.

* utf7.el: Require `nnheader' instead of `mm-util'.

diff --git a/ChangeLog b/ChangeLog
index ae9018c..befa62e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
 2004-05-21  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-       * lisp/nnheader.el (mm-string-make-unibyte): New function.
+       * lisp/nnheader.el (mm-disable-multibyte): New function.
+       (mm-enable-multibyte): New function.
+       (mm-encode-coding-region): New function.
+       (mm-string-make-unibyte): New function.
 
-       * lisp/utf7.el: Require `mm-util' only when compiling.
+       * lisp/utf7.el: Require `nnheader' instead of `mm-util'.
 
 2004-05-02  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
 

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index 297dd0f..cfee952 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -288,6 +288,18 @@ nil, ."
        (and (fboundp 'coding-system-p) (coding-system-p sym))))
   (defalias 'mm-coding-system-p 'nnheader-coding-system-p)
 
+  (defalias 'mm-disable-multibyte
+    (static-if (featurep 'xemacs)
+       'ignore
+      (lambda nil (set-buffer-multibyte nil))))
+  (defalias 'mm-enable-multibyte
+    (static-if (featurep 'xemacs)
+       'ignore
+      ;; Why isn't it t but `to'?  See mm-util.el.
+      (lambda nil (set-buffer-multibyte 'to))))
+
+  (defalias 'mm-encode-coding-region 'encode-coding-region)
+
   (defalias 'mm-string-make-unibyte
     (if (fboundp 'string-make-unibyte)
        'string-make-unibyte

diff --git a/lisp/utf7.el b/lisp/utf7.el
index f1598f1..717fa74 100644 (file)
--- a/lisp/utf7.el
+++ b/lisp/utf7.el
@@ -65,9 +65,8 @@
 ;;; Code:
 
 (require 'base64)
-(eval-when-compile
-  (require 'cl)
-  (require 'mm-util))
+(eval-when-compile (require 'cl))
+(require 'nnheader) ;; for mm-* functions.
 
 (defconst utf7-direct-encoding-chars " -%'-*,-[]-}"
   "Character ranges which do not need escaping in UTF-7.")