[Emacs-diffs] Changes to emacs/lisp/mail/rmail.el

[Thien-Thi Nguyen]

Index: emacs/lisp/mail/rmail.el
diff -c emacs/lisp/mail/rmail.el:1.406 emacs/lisp/mail/rmail.el:1.407
*** emacs/lisp/mail/rmail.el:1.406      Fri Jul  8 22:31:32 2005
--- emacs/lisp/mail/rmail.el    Sat Aug  6 18:54:05 2005
***************
*** 1,7 ****
  ;;; rmail.el --- main code of "RMAIL" mail reader for Emacs
  
! ;; Copyright (C) 1985,86,87,88,93,94,95,96,97,98,2000,01,2004,2005
! ;;            Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: mail
--- 1,7 ----
  ;;; rmail.el --- main code of "RMAIL" mail reader for Emacs
  
! ;; Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998,
! ;;   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: mail
***************
*** 108,114 ****
    :group 'rmail-obsolete)
  
  (defcustom rmail-pop-password-required nil
!   "*Non-nil if a password is required when reading mail from a POP server. 
  Please use rmail-remote-password-required instead."
    :type 'boolean
    :group 'rmail-obsolete)
--- 108,114 ----
    :group 'rmail-obsolete)
  
  (defcustom rmail-pop-password-required nil
!   "*Non-nil if a password is required when reading mail from a POP server.
  Please use rmail-remote-password-required instead."
    :type 'boolean
    :group 'rmail-obsolete)
***************
*** 1634,1640 ****
            (pass  (match-string 5 file))
            (host  (substring file (or (match-end 2)
                                       (+ 3 (match-end 1))))))
!       
        (if (not pass)
            (when rmail-remote-password-required
              (setq got-password (not (rmail-have-password)))
--- 1634,1640 ----
            (pass  (match-string 5 file))
            (host  (substring file (or (match-end 2)
                                       (+ 3 (match-end 1))))))
! 
        (if (not pass)
            (when rmail-remote-password-required
              (setq got-password (not (rmail-have-password)))
***************
*** 1652,1670 ****
                (or (string-equal proto "pop") (string-equal proto "imap"))
                supplied-password
                got-password))))
!    
     ((string-match "^po:\\([^:]+\\)\\(:\\(.*\\)\\)?" file)
      (let (got-password supplied-password
            (proto "pop")
          (user  (match-string 1 file))
          (host  (match-string 3 file)))
!       
        (when rmail-remote-password-required
        (setq got-password (not (rmail-have-password)))
        (setq supplied-password (rmail-get-remote-password nil)))
  
        (list file "pop" supplied-password got-password)))
!    
     (t
      (list file nil nil nil))))
  
--- 1652,1670 ----
                (or (string-equal proto "pop") (string-equal proto "imap"))
                supplied-password
                got-password))))
! 
     ((string-match "^po:\\([^:]+\\)\\(:\\(.*\\)\\)?" file)
      (let (got-password supplied-password
            (proto "pop")
          (user  (match-string 1 file))
          (host  (match-string 3 file)))
! 
        (when rmail-remote-password-required
        (setq got-password (not (rmail-have-password)))
        (setq supplied-password (rmail-get-remote-password nil)))
  
        (list file "pop" supplied-password got-password)))
! 
     (t
      (list file nil nil nil))))
  
***************
*** 2614,2620 ****
       (let ((mail-followup-to (mail-fetch-field "mail-followup-to" nil t)))
         (when mail-followup-to
         (let ((addresses
!               (split-string 
                 (mail-strip-quoted-names mail-followup-to)
                 ",[[:space:]]+" t)))
           (dolist (addr addresses)
--- 2614,2620 ----
       (let ((mail-followup-to (mail-fetch-field "mail-followup-to" nil t)))
         (when mail-followup-to
         (let ((addresses
!               (split-string
                 (mail-strip-quoted-names mail-followup-to)
                 ",[[:space:]]+" t)))
           (dolist (addr addresses)