(quoted-printable-encode-region): Don't use mm-find-charset-region.

1 files changed, 7 insertions, 4 deletions

diff --git a/lisp/gnus/qp.el b/lisp/gnus/qp.el
index 5bfb149bf69..6d2c01d41d8 100644
--- a/lisp/gnus/qp.el
+++ b/lisp/gnus/qp.el
@@ -85,10 +85,13 @@ the form expected by `skip-chars-forward'.
 If `mm-use-ultra-safe-encoding' is set, fold lines unconditionally and
 encode lines starting with \"From\"."
   (interactive "r")
-  (if (delq 'eight-bit-graphic
-            (delq 'eight-bit-control
-                  (delq 'ascii (mm-find-charset-region from to))))
-      (error "Multibyte character in QP encoding region"))
+  ;; Fixme: what should this do in XEmacs/Mule?
+  (if (fboundp 'find-charset-region)    ; else XEmacs, non-Mule
+      (if (delq 'unknown                ; Emacs 20 unibyte
+                (delq 'eight-bit-graphic ; Emacs 21
+                      (delq 'eight-bit-control
+                            (delq 'ascii (find-charset-region from to)))))
+          (error "Multibyte character in QP encoding region")))
   (unless class
     (setq class "^\000-\007\013\015-\037\200-\377="))
   (if (fboundp 'string-as-multibyte)