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

[Miles Bader]

Index: emacs/lisp/gnus/pop3.el
diff -c emacs/lisp/gnus/pop3.el:1.23 emacs/lisp/gnus/pop3.el:1.24
*** emacs/lisp/gnus/pop3.el:1.23        Sat Sep  4 13:13:44 2004
--- emacs/lisp/gnus/pop3.el     Tue Oct 12 02:25:56 2004
***************
*** 37,61 ****
  
  (require 'mail-utils)
  
! (defvar pop3-maildrop (or (user-login-name) (getenv "LOGNAME") (getenv 
"USER") nil)
!   "*POP3 maildrop.")
! (defvar pop3-mailhost (or (getenv "MAILHOST") nil)
!   "*POP3 mailhost.")
! (defvar pop3-port 110
!   "*POP3 port.")
  
! (defvar pop3-password-required t
!   "*Non-nil if a password is required when connecting to POP server.")
  (defvar pop3-password nil
    "*Password to use when connecting to POP server.")
  
! (defvar pop3-authentication-scheme 'pass
    "*POP3 authentication scheme.
  Defaults to 'pass, for the standard USER/PASS authentication.  Other valid
! values are 'apop.")
! 
! (defvar pop3-leave-mail-on-server nil
!   "*Non-nil if the mail is to be left on the POP server after fetching.")
  
  (defvar pop3-timestamp nil
    "Timestamp returned when initially connected to the POP server.
--- 37,92 ----
  
  (require 'mail-utils)
  
! (defgroup pop3 nil
!   "Post Office Protocol"
!   :group 'mail
!   :group 'mail-source)
! 
! (defcustom pop3-maildrop (or (user-login-name)
!                            (getenv "LOGNAME")
!                            (getenv "USER"))
!   "*POP3 maildrop."
!   :version "21.4" ;; Oort Gnus
!   :type 'string
!   :group 'pop3)
! 
! (defcustom pop3-mailhost (or (getenv "MAILHOST") ;; nil -> mismatch
!                            "pop3")
!   "*POP3 mailhost."
!   :version "21.4" ;; Oort Gnus
!   :type 'string
!   :group 'pop3)
! 
! (defcustom pop3-port 110
!   "*POP3 port."
!   :version "21.4" ;; Oort Gnus
!   :type 'number
!   :group 'pop3)
! 
! (defcustom pop3-password-required t
!   "*Non-nil if a password is required when connecting to POP server."
!   :version "21.4" ;; Oort Gnus
!   :type 'boolean
!   :group 'pop3)
  
! ;; Should this be customizable?
  (defvar pop3-password nil
    "*Password to use when connecting to POP server.")
  
! (defcustom pop3-authentication-scheme 'pass
    "*POP3 authentication scheme.
  Defaults to 'pass, for the standard USER/PASS authentication.  Other valid
! values are 'apop."
!   :version "21.4" ;; Oort Gnus
!   :type '(choice (const :tag "USER/PASS" pass)
!                (const :tag "APOP" apop))
!   :group 'pop3)
! 
! (defcustom pop3-leave-mail-on-server nil
!   "*Non-nil if the mail is to be left on the POP server after fetching."
!   :version "21.4" ;; Oort Gnus
!   :type 'boolean
!   :group 'pop3)
  
  (defvar pop3-timestamp nil
    "Timestamp returned when initially connected to the POP server.
***************
*** 71,78 ****
         (crashbuf (get-buffer-create " *pop3-retr*"))
         (n 1)
         message-count
!        (pop3-password pop3-password)
!        )
      ;; for debugging only
      (if pop3-debug (switch-to-buffer (process-buffer process)))
      ;; query for password
--- 102,108 ----
         (crashbuf (get-buffer-create " *pop3-retr*"))
         (n 1)
         message-count
!        (pop3-password pop3-password))
      ;; for debugging only
      (if pop3-debug (switch-to-buffer (process-buffer process)))
      ;; query for password
***************
*** 114,121 ****
    "Return the number of messages in the maildrop."
    (let* ((process (pop3-open-server pop3-mailhost pop3-port))
         message-count
!        (pop3-password pop3-password)
!        )
      ;; for debugging only
      (if pop3-debug (switch-to-buffer (process-buffer process)))
      ;; query for password
--- 144,150 ----
    "Return the number of messages in the maildrop."
    (let* ((process (pop3-open-server pop3-mailhost pop3-port))
         message-count
!        (pop3-password pop3-password))
      ;; for debugging only
      (if pop3-debug (switch-to-buffer (process-buffer process)))
      ;; query for password
***************
*** 159,173 ****
      (insert output)))
  
  (defun pop3-send-command (process command)
!     (set-buffer (process-buffer process))
!     (goto-char (point-max))
! ;;    (if (= (aref command 0) ?P)
! ;;    (insert "PASS <omitted>\r\n")
! ;;      (insert command "\r\n"))
!     (setq pop3-read-point (point))
!     (goto-char (point-max))
!     (process-send-string process (concat command "\r\n"))
!     )
  
  (defun pop3-read-response (process &optional return)
    "Read the response from the server.
--- 188,201 ----
      (insert output)))
  
  (defun pop3-send-command (process command)
!   (set-buffer (process-buffer process))
!   (goto-char (point-max))
!   ;; (if (= (aref command 0) ?P)
!   ;;     (insert "PASS <omitted>\r\n")
!   ;;   (insert command "\r\n"))
!   (setq pop3-read-point (point))
!   (goto-char (point-max))
!   (process-send-string process (concat command "\r\n")))
  
  (defun pop3-read-response (process &optional return)
    "Read the response from the server.
***************
*** 355,381 ****
        (while (not (re-search-forward "^\\.\r\n" nil t))
        ;; Fixme: Shouldn't depend on nnheader.
        (nnheader-accept-process-output process)
-       ;; address@hidden ... to save wear and tear on the heap
-       ;; uncommented because the condensed version below is a problem for
-       ;; some.
-       (if (> (buffer-size)  20000) (sleep-for 1))
-       (if (> (buffer-size)  50000) (sleep-for 1))
-       (if (> (buffer-size) 100000) (sleep-for 1))
-       (if (> (buffer-size) 200000) (sleep-for 1))
-       (if (> (buffer-size) 500000) (sleep-for 1))
-       ;; address@hidden
-       ;; condensed into:
-       ;; (sometimes causes problems for really large messages.)
- ;     (if (> (buffer-size) 20000) (sleep-for (/ (buffer-size) 20000)))
        (goto-char start))
        (setq pop3-read-point (point-marker))
! ;; this code does not seem to work for some POP servers...
! ;; and I cannot figure out why not.
! ;      (goto-char (match-beginning 0))
! ;      (backward-char 2)
! ;      (if (not (looking-at "\r\n"))
! ;       (insert "\r\n"))
! ;      (re-search-forward "\\.\r\n")
        (goto-char (match-beginning 0))
        (setq end (point-marker))
        (pop3-clean-region start end)
--- 383,397 ----
        (while (not (re-search-forward "^\\.\r\n" nil t))
        ;; Fixme: Shouldn't depend on nnheader.
        (nnheader-accept-process-output process)
        (goto-char start))
        (setq pop3-read-point (point-marker))
!       ;; this code does not seem to work for some POP servers...
!       ;; and I cannot figure out why not.
!       ;;      (goto-char (match-beginning 0))
!       ;;      (backward-char 2)
!       ;;      (if (not (looking-at "\r\n"))
!       ;;        (insert "\r\n"))
!       ;;      (re-search-forward "\\.\r\n")
        (goto-char (match-beginning 0))
        (setq end (point-marker))
        (pop3-clean-region start end)