From: Glenn Morris <rgm@gnu.org>
Date: Fri, 4 Sep 2009 02:45:43 +0000 (+0000)
Subject: (quoted-printable-encode-string): Use mm-enable-multibyte, or
X-Git-Tag: emacs-pretest-23.1.90~1492
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/9c1cf6317b979165675307b3b73e5dad9e617b8a

(quoted-printable-encode-string): Use mm-enable-multibyte, or
mm-disable-multibyte, rather than default-enable-multibyte-characters.
---

diff --git a/lisp/gnus/qp.el b/lisp/gnus/qp.el
index d8d6d5d552..aeec743ce5 100644
--- a/lisp/gnus/qp.el
+++ b/lisp/gnus/qp.el
@@ -1,7 +1,7 @@
 ;;; qp.el --- Quoted-Printable functions
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+;;   2007, 2008, 2009  Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail, extensions
@@ -154,11 +154,13 @@ encode lines starting with \"From\"."
 
 (defun quoted-printable-encode-string (string)
   "Encode the STRING as quoted-printable and return the result."
-  (let ((default-enable-multibyte-characters (mm-multibyte-string-p string)))
-    (with-temp-buffer
-      (insert string)
-      (quoted-printable-encode-region (point-min) (point-max))
-      (buffer-string))))
+  (with-temp-buffer
+    (if (mm-multibyte-string-p string)
+	(mm-enable-multibyte)
+      (mm-disable-multibyte))
+    (insert string)
+    (quoted-printable-encode-region (point-min) (point-max))
+    (buffer-string)))
 
 (provide 'qp)