Synch to No Gnus 200503230048.

[elisp/gnus.git-] / lisp / utf7.el

diff --git a/lisp/utf7.el b/lisp/utf7.el
index f1598f1..c540076 100644 (file)
--- a/lisp/utf7.el
+++ b/lisp/utf7.el
@@ -59,15 +59,14 @@
 ;; $ echo "a+£"|iconv -f iso-8859-1 -t utf-7
 ;; a+-+AKM
 ;;
-;;  -- fx 
+;;  -- fx
 
 
 ;;; 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.")
@@ -79,7 +78,7 @@
 (defconst utf7-utf-16-coding-system
   (cond ((mm-coding-system-p 'utf-16-be-no-signature) ; Mule-UCS
         'utf-16-be-no-signature)
-       ((and (mm-coding-system-p 'utf-16-be) ; Emacs 21.4 (?), Emacs 22
+       ((and (mm-coding-system-p 'utf-16-be) ; Emacs 22.1
              ;; Avoid versions with BOM.
              (= 2 (length (encode-coding-string "a" 'utf-16-be))))
         'utf-16-be)