*** dist/Makefile.dist Thu Mar 27 20:34:53 2003 --- Makefile Sun Mar 30 15:51:43 2003 *************** *** 145,150 **** # Solaris 8's tr -d '\r' removes r's so we use '\015' instead. vm-autoload.elc: $(SOURCES) @echo scanning sources to build autoload definitions... ! @$(EMACS) $(BATCHFLAGS) -l ./make-autoloads -f print-autoloads $(SOURCES) | tr -d '\015' >> vm-autoload.el ! @echo "(provide 'vm-autoload)" >> vm-autoload.el @echo compiling vm-autoload.el... --- 145,151 ---- # Solaris 8's tr -d '\r' removes r's so we use '\015' instead. + # the echo command can also emit CRs. vm-autoload.elc: $(SOURCES) @echo scanning sources to build autoload definitions... ! @$(EMACS) $(BATCHFLAGS) -l ./make-autoloads -f print-autoloads $(SOURCES) | tr -d '\015' > vm-autoload.el ! @echo "(provide 'vm-autoload)" | tr -d '\015' >> vm-autoload.el @echo compiling vm-autoload.el... *** dist/vm-digest.el.dist Thu Mar 27 20:34:53 2003 --- vm-digest.el Sat May 3 14:31:52 2003 *************** *** 174,175 **** --- 174,182 ---- (vm-munge-message-separators folder-type start (point)) + ;; remove any leading newlines as they will + ;; make vm-reorder-message-headers think the + ;; header section has ended. + (save-excursion + (goto-char start) + (while (= (following-char) ?\n) + (delete-char 1))) (insert (vm-trailing-message-separator folder-type))) *************** *** 190,191 **** --- 197,205 ---- (vm-munge-message-separators folder-type start (point)) + ;; remove any leading newlines as they will + ;; make vm-reorder-message-headers think the + ;; header section has ended. + (save-excursion + (goto-char start) + (while (= (following-char) ?\n) + (delete-char 1))) (insert (vm-trailing-message-separator folder-type)) *************** *** 464,467 **** ;; any old format will do. Adding blank ! ;; lines after teh message separator is ! ;; common. Spaces on such lines are an ;; added delight. --- 478,481 ---- ;; any old format will do. Adding blank ! ;; lines after the message separator is ! ;; common. Spaces in such lines are an ;; added delight. *** dist/vm-imap.el.dist Thu Mar 27 20:34:53 2003 --- vm-imap.el Sat May 3 17:10:54 2003 *************** *** 685,687 **** --- 685,694 ---- + (defun vm-imap-check-connection (process) + (cond ((not (memq (process-status process) '(open run))) + (error "IMAP connection not open: %s" process)) + ((not (buffer-live-p (process-buffer process))) + (error "IMAP process %s's buffer has been killed" process)))) + (defun vm-imap-send-command (process command &optional tag no-tag) + (vm-imap-check-connection process) (goto-char (point-max)) *************** *** 1109,1110 **** --- 1116,1118 ---- (setq opoint (point)) + (vm-imap-check-connection process) (accept-process-output process) *************** *** 1161,1162 **** --- 1169,1171 ---- (while (< (- (point-max) start) n-octets) + (vm-imap-check-connection process) (accept-process-output process)) *************** *** 1179,1180 **** --- 1188,1190 ---- (forward-char 1)) + (vm-imap-check-connection process) (accept-process-output process) *************** *** 1205,1206 **** --- 1215,1217 ---- (setq done t) + (vm-imap-check-connection process) (accept-process-output process) *** dist/vm-mime.el.dist Thu Mar 27 20:34:53 2003 --- vm-mime.el Sat May 3 16:43:45 2003 *************** *** 737,739 **** (buffer-read-only nil) ! charset encoding match-start match-end start end) (save-excursion --- 737,739 ---- (buffer-read-only nil) ! charset need-conversion encoding match-start match-end start end) (save-excursion *************** *** 763,764 **** --- 763,767 ---- (delete-region (point) end))) + (and need-conversion + (setq charset (vm-mime-charset-convert-region + charset start end))) (vm-mime-charset-decode-region charset start end) *************** *** 1877,1879 **** (buffer-read-only nil) - (m (vm-mm-layout-message layout)) (charset (or (vm-mime-get-parameter layout "charset") "us-ascii"))) --- 1880,1881 ---- *************** *** 1894,1898 **** (not no-highlighting)) ! (let ((needmsg (> (- (vm-text-end-of m) ! (vm-text-of m)) ! 12000))) (if needmsg --- 1896,1898 ---- (not no-highlighting)) ! (let ((needmsg (> (- end start) 12000))) (if needmsg *************** *** 3001,3002 **** --- 3001,3004 ---- (format "%dx%d+0+0" width height) + "-page" + (format "%dx%d+0+0" width height) "-mattecolor" "white" *************** *** 3143,3146 **** starty) (format " -roll +%d+%d" hroll vroll) ! " '" file "' '" output-type newfile "'\n") (if incremental --- 3145,3154 ---- starty) + " -page" + (format " %dx%d+0+%d" + width + (+ min-height adjustment + (if (zerop remainder) 0 1)) + starty) (format " -roll +%d+%d" hroll vroll) ! " \"" file "\" \"" output-type newfile "\"\n") (if incremental *************** *** 3156,3157 **** --- 3164,3171 ---- starty) + "-page" + (format "%dx%d+0+%d" + width + (+ min-height adjustment + (if (zerop remainder) 0 1)) + starty) "-roll" *************** *** 3560,3562 **** (vm-delete-mime-object (expand-file-name file)) ! (error nil)))))) --- 3574,3577 ---- (vm-delete-mime-object (expand-file-name file)) ! (error nil)))) ! file )) *************** *** 4425,4426 **** --- 4440,4444 ---- (vm-mime-attach-object buf "message/rfc822" nil description nil) + (make-local-variable 'vm-forward-list) + (setq vm-system-state 'forwarding + vm-forward-list (list message)) (add-hook 'kill-buffer-hook *************** *** 4453,4454 **** --- 4471,4475 ---- boundary "\"")) nil t) + (make-local-variable 'vm-forward-list) + (setq vm-system-state 'forwarding + vm-forward-list (copy-sequence message)) (add-hook 'kill-buffer-hook *** dist/vm-misc.el.dist Thu Mar 27 20:34:53 2003 --- vm-misc.el Sat May 3 16:36:26 2003 *************** *** 613,616 **** (progn ! ;; mode 600 ! (set-default-file-modes (* 6 8 8)) (vm-error-free-call 'delete-file file) --- 613,615 ---- (progn ! (set-default-file-modes (vm-octal 600)) (vm-error-free-call 'delete-file file) *** dist/vm-pop.el.dist Thu Mar 27 20:34:53 2003 --- vm-pop.el Sat May 3 17:11:03 2003 *************** *** 631,633 **** --- 631,640 ---- + (defun vm-pop-check-connection (process) + (cond ((not (memq (process-status process) '(open run))) + (error "POP connection not open: %s" process)) + ((not (buffer-live-p (process-buffer process))) + (error "POP process %s's buffer has been killed" process)))) + (defun vm-pop-send-command (process command) + (vm-pop-check-connection process) (goto-char (point-max)) *************** *** 640,641 **** --- 647,649 ---- (defun vm-pop-read-response (process &optional return-response-string) + (vm-pop-check-connection process) (let ((case-fold-search nil) *************** *** 644,645 **** --- 652,654 ---- (while (not (search-forward "\r\n" nil t)) + (vm-pop-check-connection process) (accept-process-output process) *************** *** 656,657 **** --- 665,667 ---- (defun vm-pop-read-past-dot-sentinel-line (process) + (vm-pop-check-connection process) (let ((case-fold-search nil)) *************** *** 662,663 **** --- 672,674 ---- (let ((opoint (point))) + (vm-pop-check-connection process) (accept-process-output process) *************** *** 680,681 **** --- 691,693 ---- (defun vm-pop-read-uidl-long-response (process) + (vm-pop-check-connection process) (let ((start vm-pop-read-point) *************** *** 689,690 **** --- 701,703 ---- (let ((opoint (point))) + (vm-pop-check-connection process) (accept-process-output process) *************** *** 776,777 **** --- 789,791 ---- (defun vm-pop-retrieve-to-target (process target statblob) + (vm-pop-check-connection process) (let ((start vm-pop-read-point) end) *************** *** 792,793 **** --- 806,808 ---- (after-change-functions (cons func after-change-functions))) + (vm-pop-check-connection process) (accept-process-output process) *************** *** 896,897 **** --- 911,913 ---- (let ((opoint (point))) + (vm-pop-check-connection process) (accept-process-output process) *** dist/vm-startup.el.dist Thu Mar 27 20:34:53 2003 --- vm-startup.el Sat May 3 18:19:37 2003 *************** *** 376,378 **** ! This is VM 7.14. --- 376,378 ---- ! This is VM 7.15. *************** *** 642,644 **** vm-mime-ignore-mime-version ! vm-mime-ignore-missing-multiparty-boundary vm-mime-internal-content-type-exceptions --- 642,644 ---- vm-mime-ignore-mime-version ! vm-mime-ignore-missing-multipart-boundary vm-mime-internal-content-type-exceptions *************** *** 1432,1434 **** 'vm-mime-ignore-mime-version ! 'vm-mime-ignore-missing-multiparty-boundary 'vm-mime-internal-content-type-exceptions --- 1432,1434 ---- 'vm-mime-ignore-mime-version ! 'vm-mime-ignore-missing-multipart-boundary 'vm-mime-internal-content-type-exceptions *** dist/vm-vars.el.dist Thu Mar 27 20:34:53 2003 --- vm-vars.el Thu May 1 11:04:42 2003 *************** *** 19,21 **** ! ;; Emacs 19.34 doens't have defcustom but we want to continue to ;; supoprt that Emacs version. So fake up some definitions if we --- 19,21 ---- ! ;; Emacs 19.34 doesn't have defcustom but we want to continue to ;; supoprt that Emacs version. So fake up some definitions if we *************** *** 38,39 **** --- 38,43 ---- + (defgroup vm nil + "The VM mail reader." + :group 'mail) + (defcustom vm-init-file "~/.vm" *************** *** 693,695 **** messages are immediately flagged as read." ! :type '(choice (const nil) integer)) --- 697,699 ---- messages are immediately flagged as read." ! :type '(choice boolean integer)) *************** *** 841,843 **** object to a file." ! :type '(repeat string)) --- 845,847 ---- object to a file." ! :type '(choice (const t) (repeat string))) *************** *** 1159,1161 **** A nil value means VM should display images without cutting them ! into strips.") --- 1163,1166 ---- A nil value means VM should display images without cutting them ! into strips." ! :type 'boolean) *************** *** 1455,1456 **** --- 1460,1467 ---- + (defcustom vm-mime-attachment-source-directory nil + "*Non-nil value is a default source directory for MIME attachments. + When vm-mime-attach=file prompts you for the name of a file to + attach, any relative pathnames will be relative to this directory." + :type '(choice (const nil) directory)) + (defcustom vm-infer-mime-types nil *************** *** 1711,1713 **** cleanly and Emacs will respond to your keystrokes as usual." ! :type '(choice integer (const nil))) --- 1722,1724 ---- cleanly and Emacs will respond to your keystrokes as usual." ! :type '(choice boolean integer)) *************** *** 1731,1733 **** file itself." ! :type '(choice (const nil) (const t) (const if-already-visited))) --- 1742,1744 ---- file itself." ! :type '(choice boolean (const if-already-visited))) *************** *** 1915,1917 **** Commands that modify message attributes or messages themselves are disallowed. ! Commands that add or delete messages from the folder are disallowed. Commands that scan or allow the reading of messages are allowed but the --- 1926,1928 ---- Commands that modify message attributes or messages themselves are disallowed. ! Commands that add or remove messages from the folder are disallowed. Commands that scan or allow the reading of messages are allowed but the *************** *** 1933,1941 **** "*Non-nil value N causes VM to keep the last N messages sent from within VM. ! `Keep' means that VM will not kill the VM mail buffer after you send a message ! with C-c C-c (`vm-mail-send-and-exit'). A value of 0 or nil causes VM never ! to keep such buffers. A value of t causes VM never to kill such buffers. Note that these buffers will vanish once you exit Emacs. To keep a permanent ! record of your outgoing mail, use the mail-archive-file-name variable." ! :type '(choice (const nil) integer)) --- 1944,1953 ---- "*Non-nil value N causes VM to keep the last N messages sent from within VM. ! `Keep' means that VM will not kill the composition buffer after ! you send a message with C-c C-c (`vm-mail-send-and-exit'). A ! value of 0 or nil causes VM never to keep such buffers. A value ! of t causes VM never to kill such buffers. Note that these buffers will vanish once you exit Emacs. To keep a permanent ! record of your outgoing mail, use the `mail-archive-file-name' variable." ! :type '(choice boolean integer)) *** dist/vm-version.el.dist Thu Mar 27 20:34:53 2003 --- vm-version.el Sat May 3 18:19:37 2003 *************** *** 3,5 **** ! (defconst vm-version "7.14" "Version number of VM.") --- 3,5 ---- ! (defconst vm-version "7.15" "Version number of VM.")