[Emacs-diffs] Changes to emacs/lisp/gnus/nnimap.el [gnus-5_10-branch]

[Reiner Steib]

Index: emacs/lisp/gnus/nnimap.el
diff -c emacs/lisp/gnus/nnimap.el:1.13.2.1 emacs/lisp/gnus/nnimap.el:1.13.2.2
*** emacs/lisp/gnus/nnimap.el:1.13.2.1  Thu Jul 22 16:45:51 2004
--- emacs/lisp/gnus/nnimap.el   Mon Aug 30 18:18:30 2004
***************
*** 1,5 ****
  ;;; nnimap.el --- imap backend for Gnus
! ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
  ;;        Free Software Foundation, Inc.
  
  ;; Author: Simon Josefsson <address@hidden>
--- 1,5 ----
  ;;; nnimap.el --- imap backend for Gnus
! ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
  ;;        Free Software Foundation, Inc.
  
  ;; Author: Simon Josefsson <address@hidden>
***************
*** 391,401 ****
                                          (string :format "Login: %v"))
                                    (cons :format "%v"
                                          (const :format "" "password")
!                                         (string :format "Password: %v")))))))
  
  (defcustom nnimap-prune-cache t
    "If non-nil, nnimap check whether articles still exist on server before 
using data stored in NOV cache."
!   :type 'boolean)
  
  (defvar nnimap-request-list-method 'imap-mailbox-list
    "Method to use to request a list of all folders from the server.
--- 391,403 ----
                                          (string :format "Login: %v"))
                                    (cons :format "%v"
                                          (const :format "" "password")
!                                         (string :format "Password: %v"))))))
!   :group 'nnimap)
  
  (defcustom nnimap-prune-cache t
    "If non-nil, nnimap check whether articles still exist on server before 
using data stored in NOV cache."
!   :type 'boolean
!   :group 'nnimap)
  
  (defvar nnimap-request-list-method 'imap-mailbox-list
    "Method to use to request a list of all folders from the server.
***************
*** 802,810 ****
      (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 "")))
  
--- 804,815 ----
      (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 "")))