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

[Miles Bader]

Index: emacs/lisp/gnus/mail-source.el
diff -c emacs/lisp/gnus/mail-source.el:1.12 emacs/lisp/gnus/mail-source.el:1.13
*** emacs/lisp/gnus/mail-source.el:1.12 Thu Mar 21 14:11:23 2002
--- emacs/lisp/gnus/mail-source.el      Tue Feb  4 08:06:38 2003
***************
*** 92,103 ****
                        (const :format "" pop)
                        (checklist :tag "Options" :greedy t
                                   (group :inline t
!                                         (const :format "" :value :server) 
                                          (string :tag "Server"))
                                   (group :inline t
!                                         (const :format "" :value :port) 
                                          (choice :tag "Port"
!                                                 :value "pop3" 
                                                  (number :format "%v")
                                                  (string :format "%v")))
                                   (group :inline t
--- 92,103 ----
                        (const :format "" pop)
                        (checklist :tag "Options" :greedy t
                                   (group :inline t
!                                         (const :format "" :value :server)
                                          (string :tag "Server"))
                                   (group :inline t
!                                         (const :format "" :value :port)
                                          (choice :tag "Port"
!                                                 :value "pop3"
                                                  (number :format "%v")
                                                  (string :format "%v")))
                                   (group :inline t
***************
*** 119,125 ****
                                          (const :format "" :value :function)
                                          (function :tag "Function"))
                                   (group :inline t
!                                         (const :format "" 
                                                 :value :authentication)
                                          (choice :tag "Authentication"
                                                  :value apop
--- 119,125 ----
                                          (const :format "" :value :function)
                                          (function :tag "Function"))
                                   (group :inline t
!                                         (const :format ""
                                                 :value :authentication)
                                          (choice :tag "Authentication"
                                                  :value apop
***************
*** 145,152 ****
                                          (string :tag "Server"))
                                   (group :inline t
                                          (const :format "" :value :port)
!                                         (choice :tag "Port" 
!                                                 :value 143 
                                                  number string))
                                   (group :inline t
                                          (const :format "" :value :user)
--- 145,152 ----
                                          (string :tag "Server"))
                                   (group :inline t
                                          (const :format "" :value :port)
!                                         (choice :tag "Port"
!                                                 :value 143
                                                  number string))
                                   (group :inline t
                                          (const :format "" :value :user)
***************
*** 171,177 ****
                                                  :value "INBOX"))
                                   (group :inline t
                                          (const :format "" :value :predicate)
!                                         (string :tag "Predicate" 
                                                  :value "UNSEEN UNDELETED"))
                                   (group :inline t
                                          (const :format "" :value :fetchflag)
--- 171,177 ----
                                                  :value "INBOX"))
                                   (group :inline t
                                          (const :format "" :value :predicate)
!                                         (string :tag "Predicate"
                                                  :value "UNSEEN UNDELETED"))
                                   (group :inline t
                                          (const :format "" :value :fetchflag)
***************
*** 187,193 ****
                  (cons :tag "Webmail server"
                        (const :format "" webmail)
                        (checklist :tag "Options" :greedy t
!                                  (group :inline t 
                                         (const :format "" :value :subtype)
                                         ;; Should be generated from
                                         ;; `webmail-type-definition', but we
--- 187,193 ----
                  (cons :tag "Webmail server"
                        (const :format "" webmail)
                        (checklist :tag "Options" :greedy t
!                                  (group :inline t
                                         (const :format "" :value :subtype)
                                         ;; Should be generated from
                                         ;; `webmail-type-definition', but we
***************
*** 739,745 ****
  (defvar mail-source-report-new-mail-timer nil)
  (defvar mail-source-report-new-mail-idle-timer nil)
  
! (eval-when-compile 
    (if (featurep 'xemacs)
        (require 'itimer)
      (require 'timer)))
--- 739,745 ----
  (defvar mail-source-report-new-mail-timer nil)
  (defvar mail-source-report-new-mail-idle-timer nil)
  
! (eval-when-compile
    (if (featurep 'xemacs)
        (require 'itimer)
      (require 'timer)))
***************
*** 810,825 ****
            (when (and (not (file-directory-p file))
                       (not (if function
                                (funcall function file mail-source-crash-box)
!                             (let ((coding-system-for-write 
                                     mm-text-coding-system)
!                                   (coding-system-for-read 
                                     mm-text-coding-system))
                                (with-temp-file mail-source-crash-box
                                  (insert-file-contents file)
                                  (goto-char (point-min))
  ;;;                               ;; Unix mail format
  ;;;                             (unless (looking-at "\n*From ")
! ;;;                               (insert "From maildir " 
  ;;;                                       (current-time-string) "\n"))
  ;;;                             (while (re-search-forward "^From " nil t)
  ;;;                               (replace-match ">From "))
--- 810,825 ----
            (when (and (not (file-directory-p file))
                       (not (if function
                                (funcall function file mail-source-crash-box)
!                             (let ((coding-system-for-write
                                     mm-text-coding-system)
!                                   (coding-system-for-read
                                     mm-text-coding-system))
                                (with-temp-file mail-source-crash-box
                                  (insert-file-contents file)
                                  (goto-char (point-min))
  ;;;                               ;; Unix mail format
  ;;;                             (unless (looking-at "\n*From ")
! ;;;                               (insert "From maildir "
  ;;;                                       (current-time-string) "\n"))
  ;;;                             (while (re-search-forward "^From " nil t)
  ;;;                               (replace-match ">From "))
***************
*** 915,928 ****
        (when (eq authentication 'password)
        (setq password
              (or password
!                 (cdr (assoc (format "webmail:%s:%s" subtype user) 
                              mail-source-password-cache))
                  (mail-source-read-passwd
                   (format "Password for %s at %s: " user subtype))))
        (when (and password
!                  (not (assoc (format "webmail:%s:%s" subtype user) 
                               mail-source-password-cache)))
!         (push (cons (format "webmail:%s:%s" subtype user) password) 
                mail-source-password-cache)))
        (webmail-fetch mail-source-crash-box subtype user password)
        (mail-source-callback callback (symbol-name subtype)))))
--- 915,928 ----
        (when (eq authentication 'password)
        (setq password
              (or password
!                 (cdr (assoc (format "webmail:%s:%s" subtype user)
                              mail-source-password-cache))
                  (mail-source-read-passwd
                   (format "Password for %s at %s: " user subtype))))
        (when (and password
!                  (not (assoc (format "webmail:%s:%s" subtype user)
                               mail-source-password-cache)))
!         (push (cons (format "webmail:%s:%s" subtype user) password)
                mail-source-password-cache)))
        (webmail-fetch mail-source-crash-box subtype user password)
        (mail-source-callback callback (symbol-name subtype)))))