(nnimap-demule): Revert 2004-08-30 change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c5f727..61caada 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2004-09-13  Simon Josefsson  <jas@extundo.com>
 
+       * nnimap.el (nnimap-demule): Revert 2004-08-30 change.
+
        * dns-mode.el (dns-mode): Fix menu for XEmacs, reported by Steve
        Youngs <steve@youngs.au.com> and suggested by Katsumi Yamaoka
        <yamaoka@jpl.org>.

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 43b96c4..efffa92 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -850,9 +850,11 @@ function is generally only called when Gnus is shutting down."
   ;; BEWARE: we used to use string-as-multibyte here which is braindead
   ;; because it will turn accidental emacs-mule-valid byte sequences
   ;; into multibyte chars.  --Stef
-  (funcall (if (and (fboundp 'string-to-multibyte)
-                   (subrp (symbol-function 'string-to-multibyte)))
-              'string-to-multibyte
+  ;; Reverted, braindead got 7.5 out of 10 on imdb, so it can't be
+  ;; that bad. --Simon
+  (funcall (if (and (fboundp 'string-as-multibyte)
+                   (subrp (symbol-function 'string-as-multibyte)))
+              'string-as-multibyte
             'identity)
           (or string "")))