[Emacs-diffs] Changes to emacs/lisp/gnus/nnimap.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/gnus/nnimap.el
diff -c emacs/lisp/gnus/nnimap.el:1.10.6.1 emacs/lisp/gnus/nnimap.el:1.10.6.2
*** emacs/lisp/gnus/nnimap.el:1.10.6.1  Fri Mar 12 00:03:11 2004
--- emacs/lisp/gnus/nnimap.el   Mon Jun 28 07:29:46 2004
***************
*** 1,5 ****
  ;;; nnimap.el --- imap backend for Gnus
! ;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
  
  ;; Author: Simon Josefsson <address@hidden>
  ;;         Jim Radford <address@hidden>
--- 1,6 ----
  ;;; nnimap.el --- imap backend for Gnus
! 
! ;; Copyright (C) 1998,1999,2000,01,02,2004  Free Software Foundation, Inc.
  
  ;; Author: Simon Josefsson <address@hidden>
  ;;         Jim Radford <address@hidden>
***************
*** 671,679 ****
      (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
             'identity)
           (or string "")))
  
--- 672,683 ----
      (nnoo-status-message 'nnimap server)))
  
  (defun nnimap-demule (string)
!   ;; 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,1387 ****
  
  (provide 'nnimap)
  
! ;;; arch-tag: 2b001f20-3ff9-4094-a0ad-46807c1ba70b
  ;;; nnimap.el ends here
--- 1387,1391 ----
  
  (provide 'nnimap)
  
! ;; arch-tag: 2b001f20-3ff9-4094-a0ad-46807c1ba70b
  ;;; nnimap.el ends here