From 31a54b0e66f0cdbc058b1127fe79f393b8df18d9 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 6 May 2004 21:28:03 +0000 Subject: [PATCH] (nnimap-demule): Avoid string-as-multibyte. --- lisp/gnus/ChangeLog | 4 ++++ lisp/gnus/nnimap.el | 14 +++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index dc39720f79b..ac1bad7e3ab 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2004-05-06 Stefan Monnier + + * nnimap.el (nnimap-demule): Avoid string-as-multibyte. + 2004-03-27 Juanma Barranquero * gnus-srvr.el (gnus-server-prepare): Remove spurious call to `cdr'. diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 02cb87af28b..a7cf82317b5 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -1,5 +1,6 @@ ;;; nnimap.el --- imap backend for Gnus -;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + +;; Copyright (C) 1998,1999,2000,01,02,2004 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Jim Radford @@ -671,9 +672,12 @@ function is generally only called when Gnus is shutting down." (nnoo-status-message 'nnimap server))) (defun nnimap-demule (string) - (funcall (if (and (fboundp 'string-as-multibyte) - (subrp (symbol-function 'string-as-multibyte))) - 'string-as-multibyte + ;; 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 'identity) (or string ""))) @@ -1383,5 +1387,5 @@ sure of changing the value of `foo'." (provide 'nnimap) -;;; arch-tag: 2b001f20-3ff9-4094-a0ad-46807c1ba70b +;; arch-tag: 2b001f20-3ff9-4094-a0ad-46807c1ba70b ;;; nnimap.el ends here -- 2.39.2