*** dist/vm-folder.el.dist Mon Jul 13 11:05:09 1998 --- vm-folder.el Tue Jul 14 10:20:35 1998 *************** *** 3387,3390 **** (vm-imap-ok-to-ask interactive) ! (non-file-maildrop nil) ! crash in safe-maildrop maildrop popdrop retrieval-function --- 3387,3389 ---- (vm-imap-ok-to-ask interactive) ! non-file-maildrop crash in safe-maildrop maildrop popdrop retrieval-function *************** *** 3406,3408 **** crash (nth 2 (car triples))) ! (setq safe-maildrop maildrop) (cond ((vm-movemail-specific-spool-file-p maildrop) --- 3405,3408 ---- crash (nth 2 (car triples))) ! (setq safe-maildrop maildrop ! non-file-maildrop nil) (cond ((vm-movemail-specific-spool-file-p maildrop) *************** *** 3435,3436 **** --- 3435,3439 ---- (setq crash (expand-file-name crash vm-folder-directory)) + (if (not non-file-maildrop) + (setq maildrop (expand-file-name maildrop + vm-folder-directory))) (if (if got-mail *** dist/vm-imap.el.dist Mon Jul 13 11:05:09 1998 --- vm-imap.el Tue Jul 14 10:32:07 1998 *************** *** 375,377 **** greeting timestamp ! host port auth user pass source-list process-buffer source-nopwd) (unwind-protect --- 375,378 ---- greeting timestamp ! host port auth user pass source-list process-buffer ! source-nopwd-nombox) (unwind-protect *************** *** 386,388 **** pass (nth 6 source-list) ! source-nopwd (vm-imapdrop-sans-password source)) ;; carp if parts are missing --- 387,390 ---- pass (nth 6 source-list) ! source-nopwd-nombox ! (vm-imapdrop-sans-password-and-mailbox source)) ;; carp if parts are missing *************** *** 406,408 **** (progn ! (setq pass (car (cdr (assoc source-nopwd vm-imap-passwords)))) (if (null pass) --- 408,411 ---- (progn ! (setq pass (car (cdr (assoc source-nopwd-nombox ! vm-imap-passwords)))) (if (null pass) *************** *** 418,421 **** ;; imapdrop specifications to vm-make-imap-session. ! (if (null (assoc source-nopwd vm-imap-passwords)) ! (setq vm-imap-passwords (cons (list source-nopwd pass) vm-imap-passwords))) --- 421,424 ---- ;; imapdrop specifications to vm-make-imap-session. ! (if (null (assoc source-nopwd-nombox vm-imap-passwords)) ! (setq vm-imap-passwords (cons (list source-nopwd-nombox pass) vm-imap-passwords))) *************** *** 452,454 **** (setq vm-imap-passwords ! (delete (list source-nopwd pass) vm-imap-passwords)) --- 455,457 ---- (setq vm-imap-passwords ! (delete (list source-nopwd-nombox pass) vm-imap-passwords)) *************** *** 797,803 **** (setq response (vm-imap-read-response process)) ! (cond ((vm-imap-response-matches response '* 'OK 'atom 'Cyrus 'IMAP4) ! (message "VM doesn't work with the CMU Cyrus IMAP server, aborting") ! (sleep-for 2) ! nil ) ! ((vm-imap-response-matches response '* 'OK) t ) --- 800,802 ---- (setq response (vm-imap-read-response process)) ! (cond ((vm-imap-response-matches response '* 'OK) t ) *************** *** 838,839 **** --- 837,847 ---- (nth 3 source-list) ":" + (nth 4 source-list) ":" + (nth 5 source-list) ":*"))) + + (defun vm-imapdrop-sans-password-and-mailbox (source) + (let (source-list) + (setq source-list (vm-parse source "\\([^:]+\\):?")) + (concat (nth 0 source-list) ":" + (nth 1 source-list) ":" + (nth 2 source-list) ":*:" (nth 4 source-list) ":" *** dist/vm-mime.el.dist Mon Jul 13 11:05:10 1998 --- vm-mime.el Mon Jul 13 15:43:01 1998 *************** *** 448,450 **** ;; bodies with a line break. 21 June 1998. ! ;; Actually it looks like Eudora doens't understand the ;; multipart newline boundary rule at all and can leave --- 448,450 ---- ;; bodies with a line break. 21 June 1998. ! ;; Actually it looks like Eudora doesn't understand the ;; multipart newline boundary rule at all and can leave *** dist/vm-startup.el.dist Mon Jul 13 11:05:13 1998 --- vm-startup.el Tue Jul 14 10:27:55 1998 *************** *** 295,297 **** ! This is VM 6.55. --- 295,297 ---- ! This is VM 6.56. *** dist/vm-vars.el.dist Mon Jul 13 11:05:15 1998 --- vm-vars.el Mon Jul 13 15:43:02 1998 *************** *** 236,238 **** (defvar vm-pop-messages-per-session nil ! "*Non-nil value should be a integer specifying how many messages to retrieve per POP session. When you type 'g' to get new mail, VM --- 236,238 ---- (defvar vm-pop-messages-per-session nil ! "*Non-nil value should be an integer specifying how many messages to retrieve per POP session. When you type 'g' to get new mail, VM *************** *** 244,246 **** (defvar vm-pop-bytes-per-session nil ! "*Non-nil value should be a integer specifying how many bytes to retrieve per POP session. When you type 'g' to get new mail, VM --- 244,246 ---- (defvar vm-pop-bytes-per-session nil ! "*Non-nil value should be an integer specifying how many bytes to retrieve per POP session. When you type 'g' to get new mail, VM *************** *** 297,299 **** (defvar vm-imap-messages-per-session nil ! "*Non-nil value should be a integer specifying how many messages to retrieve per IMAP session. When you type 'g' to get new mail, VM --- 297,299 ---- (defvar vm-imap-messages-per-session nil ! "*Non-nil value should be an integer specifying how many messages to retrieve per IMAP session. When you type 'g' to get new mail, VM *************** *** 305,307 **** (defvar vm-imap-bytes-per-session nil ! "*Non-nil value should be a integer specifying how many bytes to retrieve per IMAP session. When you type 'g' to get new mail, VM --- 305,307 ---- (defvar vm-imap-bytes-per-session nil ! "*Non-nil value should be an integer specifying how many bytes to retrieve per IMAP session. When you type 'g' to get new mail, VM *************** *** 314,316 **** (defvar vm-imap-expunge-after-retrieving t ! "*Non-nil value means immediately remove messages from a IMAP mailbox after retrieving them. A nil value means messages will be left --- 314,316 ---- (defvar vm-imap-expunge-after-retrieving t ! "*Non-nil value means immediately remove messages from an IMAP mailbox after retrieving them. A nil value means messages will be left *************** *** 318,320 **** ! This variable only affects IMAP mailboxex not listed in `vm-imap-auto-expunge-alist' (which see).") --- 318,320 ---- ! This variable only affects IMAP mailboxes not listed in `vm-imap-auto-expunge-alist' (which see).") *************** *** 341,343 **** "*Value if non-nil should be a regular expression that matches ! spool names found in vm-spool-files that should be considered POP maildrops. A nil value tells VM that all the spool names are to --- 341,343 ---- "*Value if non-nil should be a regular expression that matches ! spool names found in vm-spool-files that should be considered IMAP maildrops. A nil value tells VM that all the spool names are to *************** *** 968,970 **** "*Largest MIME message that VM should send without fragmentation. ! The value should be a integer which specifies the size in bytes. A message larger than this value will be split into multiple parts --- 968,970 ---- "*Largest MIME message that VM should send without fragmentation. ! The value should be an integer which specifies the size in bytes. A message larger than this value will be split into multiple parts *************** *** 1435,1437 **** ! This variable exists solely to provide a escape chute from mailing lists that add a Reply-To: mailing list header, thereby --- 1435,1437 ---- ! This variable exists solely to provide an escape chute from mailing lists that add a Reply-To: mailing list header, thereby *** dist/vm-version.el.dist Mon Jul 13 11:05:16 1998 --- vm-version.el Tue Jul 14 10:27:54 1998 *************** *** 4,6 **** ! (defconst vm-version "6.55" "Version number of VM.") --- 4,6 ---- ! (defconst vm-version "6.56" "Version number of VM.")