[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/mail/rmail.el
From: |
Kim F . Storm |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/mail/rmail.el |
Date: |
Wed, 09 Feb 2005 10:52:18 -0500 |
Index: emacs/lisp/mail/rmail.el
diff -c emacs/lisp/mail/rmail.el:1.395 emacs/lisp/mail/rmail.el:1.396
*** emacs/lisp/mail/rmail.el:1.395 Sat Jan 15 14:27:41 2005
--- emacs/lisp/mail/rmail.el Wed Feb 9 15:50:37 2005
***************
*** 117,123 ****
(const :tag "Not Required" nil))
:set-after '(rmail-pop-password)
:set #'(lambda (symbol value)
! (set-default symbol
(if (and (not value)
(boundp 'rmail-pop-password)
rmail-pop-password)
--- 117,123 ----
(const :tag "Not Required" nil))
:set-after '(rmail-pop-password)
:set #'(lambda (symbol value)
! (set-default symbol
(if (and (not value)
(boundp 'rmail-pop-password)
rmail-pop-password)
***************
*** 125,138 ****
value))
(setq rmail-pop-password nil))
:group 'rmail-retrieve
! :version "21.3.50.1")
(defcustom rmail-remote-password-required nil
"*Non-nil if a password is required when reading mail from a remote server."
:type 'boolean
:set-after '(rmail-pop-password-required)
:set #'(lambda (symbol value)
! (set-default symbol
(if (and (not value)
(boundp 'rmail-pop-password-required)
rmail-pop-password-required)
--- 125,138 ----
value))
(setq rmail-pop-password nil))
:group 'rmail-retrieve
! :version "22.1")
(defcustom rmail-remote-password-required nil
"*Non-nil if a password is required when reading mail from a remote server."
:type 'boolean
:set-after '(rmail-pop-password-required)
:set #'(lambda (symbol value)
! (set-default symbol
(if (and (not value)
(boundp 'rmail-pop-password-required)
rmail-pop-password-required)
***************
*** 140,146 ****
value))
(setq rmail-pop-password-required nil))
:group 'rmail-retrieve
! :version "21.3.50.1")
(defcustom rmail-movemail-flags nil
"*List of flags to pass to movemail.
--- 140,146 ----
value))
(setq rmail-pop-password-required nil))
:group 'rmail-retrieve
! :version "22.1")
(defcustom rmail-movemail-flags nil
"*List of flags to pass to movemail.
***************
*** 1621,1627 ****
is non-nil if the user has supplied the password interactively.
"
(if (string-match
"^\\([^:]+\\)://\\(\\([^:@]+\\)\\(:\\(address@hidden)\\)address@hidden)?.*"
file)
! (let (got-password supplied-password
(proto (match-string 1 file))
(user (match-string 3 file))
(pass (match-string 5 file))
--- 1621,1627 ----
is non-nil if the user has supplied the password interactively.
"
(if (string-match
"^\\([^:]+\\)://\\(\\([^:@]+\\)\\(:\\(address@hidden)\\)address@hidden)?.*"
file)
! (let (got-password supplied-password
(proto (match-string 1 file))
(user (match-string 3 file))
(pass (match-string 5 file))
***************
*** 1632,1638 ****
(setq got-password (not (rmail-have-password)))
(setq supplied-password (rmail-get-remote-password
(string-equal proto "imap")))))
!
(if (rmail-movemail-variant-p 'emacs)
(if (string-equal proto "pop")
(list (concat "po:" user ":" host)
--- 1632,1638 ----
(setq got-password (not (rmail-have-password)))
(setq supplied-password (rmail-get-remote-password
(string-equal proto "imap")))))
!
(if (rmail-movemail-variant-p 'emacs)
(if (string-equal proto "pop")
(list (concat "po:" user ":" host)
***************
*** 1671,1677 ****
;; Generate name to move to from inbox name,
;; in case of multiple inboxes that need moving.
(concat ".newmail-"
! (file-name-nondirectory
(if (memq system-type '(windows-nt cygwin))
;; cannot have "po:" in file name
(substring file 3)
--- 1671,1677 ----
;; Generate name to move to from inbox name,
;; in case of multiple inboxes that need moving.
(concat ".newmail-"
! (file-name-nondirectory
(if (memq system-type '(windows-nt cygwin))
;; cannot have "po:" in file name
(substring file 3)
***************
*** 1777,1790 ****
(goto-char (point-min))
(when (looking-at "[A-Z][A-Z0-9_]*:")
(delete-region (point-min) (match-end 0))))
!
(message "movemail: %s"
(buffer-substring (point-min)
(point-max)))
!
(sit-for 3)
nil)))))
!
;; At this point, TOFILE contains the name to read:
;; Either the alternate name (if we renamed)
;; or the actual inbox (if not renaming).
--- 1777,1790 ----
(goto-char (point-min))
(when (looking-at "[A-Z][A-Z0-9_]*:")
(delete-region (point-min) (match-end 0))))
!
(message "movemail: %s"
(buffer-substring (point-min)
(point-max)))
!
(sit-for 3)
nil)))))
!
;; At this point, TOFILE contains the name to read:
;; Either the alternate name (if we renamed)
;; or the actual inbox (if not renaming).
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/mail/rmail.el,
Kim F . Storm <=