*** dist/vm-mime.el.dist Fri May 21 01:07:42 1999 --- vm-mime.el Wed Jul 7 20:29:11 1999 *************** *** 1162,1166 **** ((vm-mime-types-match "message" type) t) ! ((or (vm-mime-types-match "text/plain" type) ! (and (vm-mime-types-match "text/enriched" type) ! (fboundp 'enriched-mode))) (let ((charset (or (vm-mime-get-parameter layout "charset") --- 1162,1166 ---- ((vm-mime-types-match "message" type) t) ! ((vm-mime-types-match "text/html" type) ! (fboundp 'w3-region)) ! ((vm-mime-types-match "text" type) (let ((charset (or (vm-mime-get-parameter layout "charset") *************** *** 1168,1171 **** (vm-mime-charset-internally-displayable-p charset))) - ((vm-mime-types-match "text/html" type) - (fboundp 'w3-region)) (t nil)))) --- 1168,1169 ---- *************** *** 1616,1618 **** (vm-select-folder-buffer) ! (setq vm-folder-garbage-alist (cons (cons tempfile 'delete-file) --- 1614,1616 ---- (vm-select-folder-buffer) ! (setq vm-message-garbage-alist (cons (cons tempfile 'delete-file) *************** *** 1655,1661 **** " ")) ! (save-excursion ! (vm-select-folder-buffer) ! (setq vm-message-garbage-alist ! (cons (cons process 'delete-process) ! vm-message-garbage-alist))) (vm-set-mm-layout-cache --- 1653,1660 ---- " ")) ! (if vm-mime-delete-viewer-processes ! (save-excursion ! (vm-select-folder-buffer) ! (setq vm-message-garbage-alist ! (cons (cons process 'delete-process) ! vm-message-garbage-alist)))) (vm-set-mm-layout-cache *************** *** 3103,3106 **** (setq layout (extent-property e 'vm-mime-layout)) ! (if (= (vm-mm-layout-header-start layout) ! (vm-headers-of (vm-mm-layout-message layout))) (error "Can't delete only MIME object; use vm-delete-message instead.")) --- 3102,3105 ---- (setq layout (extent-property e 'vm-mime-layout)) ! (if (eq layout (vm-mime-layout-of ! (vm-mm-layout-message layout))) (error "Can't delete only MIME object; use vm-delete-message instead.")) *************** *** 3123,3129 **** (save-excursion - (set-buffer (vm-buffer-of (vm-real-message-of - (vm-mm-layout-message layout)))) (let ((inhibit-read-only t) (buffer-read-only nil) newid new-layout) (vm-save-restriction --- 3122,3128 ---- (save-excursion (let ((inhibit-read-only t) (buffer-read-only nil) + (m (vm-mm-layout-body-end layout)) newid new-layout) + (set-buffer (vm-buffer-of m)) (vm-save-restriction *************** *** 3156,3158 **** (delete-region (point) (vm-mm-layout-body-end layout)) ! (vm-set-edited-flag-of (vm-mm-layout-message layout) t) (cond (file --- 3155,3183 ---- (delete-region (point) (vm-mm-layout-body-end layout)) ! (vm-set-edited-flag-of m t) ! (vm-set-byte-count-of m nil) ! (vm-set-line-count-of m nil) ! ;; For the dreaded From_-with-Content-Length folders recompute ! ;; the message length and make a new Content-Length header. ! (if (eq (vm-message-type-of m) 'From_-with-Content-Length) ! (let (length) ! (goto-char (vm-headers-of m)) ! ;; first delete all copies of Content-Length ! (while (and (re-search-forward vm-content-length-search-regexp ! (vm-text-of m) t) ! (null (match-beginning 1)) ! (progn (goto-char (match-beginning 0)) ! (vm-match-header vm-content-length-header))) ! (delete-region (vm-matched-header-start) ! (vm-matched-header-end))) ! ;; now compute the message body length ! (setq length (- (vm-end-of m) (vm-text-of m))) ! ;; insert the header ! (goto-char (vm-headers-of m)) ! (insert vm-content-length-header " " ! (int-to-string length) "\n"))) ! ;; make sure we get the summary updated. The 'edited' ! ;; flag might already be set and therefore trying to set ! ;; it again might not have triggered an update. We need ! ;; the update because the message size has changed. ! (vm-mark-for-summary-update (vm-mm-layout-message layout)) (cond (file *** dist/vm-page.el.dist Sun Mar 21 16:47:39 1999 --- vm-page.el Fri Jul 23 17:41:11 1999 *************** *** 573,579 **** ;; if we're using one for this message. - (vm-unbury-buffer (current-buffer)) ! (vm-energize-urls-in-message-region) ! (vm-highlight-headers-maybe) ! (vm-energize-headers-and-xfaces) --- 573,594 ---- ;; if we're using one for this message. (vm-unbury-buffer (current-buffer)) ! ! (if (and vm-display-using-mime ! vm-auto-decode-mime-messages ! vm-mime-decode-for-preview ! (if vm-mail-buffer ! (not (vm-buffer-variable-value vm-mail-buffer ! 'vm-mime-decoded)) ! (not vm-mime-decoded)) ! (not (vm-mime-plain-message-p (car vm-message-pointer)))) ! (progn ! (condition-case data ! (vm-decode-mime-message) ! (vm-mime-error (vm-set-mime-layout-of (car vm-message-pointer) ! (car (cdr data))) ! (message "%s" (car (cdr data))))) ! (vm-narrow-for-preview)) ! (vm-energize-urls-in-message-region) ! (vm-highlight-headers-maybe) ! (vm-energize-headers-and-xfaces)) *** dist/vm-sort.el.dist Fri May 21 01:07:45 1999 --- vm-sort.el Thu Jun 17 22:31:06 1999 *************** *** 457,459 **** (cond ((string-lessp date1 date2) t) ! ((string-equal date1 date2) '=) (t nil))) --- 457,460 ---- (cond ((string-lessp date1 date2) t) ! ((string-equal date1 date2) ! (string-lessp (car list1) (car list2))) (t nil))) *** dist/vm-startup.el.dist Fri May 21 01:07:45 1999 --- vm-startup.el Tue Jul 27 10:38:27 1999 *************** *** 317,319 **** ! This is VM 6.72. --- 317,319 ---- ! This is VM 6.73. *************** *** 503,504 **** --- 503,505 ---- vm-imap-messages-per-session + vm-imap-session-preauth-hook vm-index-file-suffix *************** *** 533,538 **** vm-mime-base64-encoder-switches - vm-mime-button-format-alist vm-mime-button-face vm-mime-charset-font-alist vm-mime-default-face-charsets vm-mime-digest-discard-header-regexp --- 534,544 ---- vm-mime-base64-encoder-switches vm-mime-button-face + vm-mime-button-format-alist vm-mime-charset-font-alist + vm-mime-confirm-delete + vm-mime-decode-for-preview + vm-mime-default-face-charset-exceptions vm-mime-default-face-charsets + vm-mime-delete-after-saving + vm-mime-delete-viewer-processes vm-mime-digest-discard-header-regexp *************** *** 545,547 **** --- 551,559 ---- vm-mime-max-message-size + vm-mime-qp-decoder-program + vm-mime-qp-decoder-switches + vm-mime-qp-encoder-program + vm-mime-qp-encoder-switches vm-mime-type-converter-alist + vm-mime-uuencode-decoder-program + vm-mime-uuencode-decoder-switches vm-mode-hook *************** *** 557,558 **** --- 569,571 ---- vm-netscape-program-switches + vm-paragraph-fill-column vm-pop-auto-expunge-alist *************** *** 596,599 **** --- 609,614 ---- vm-spool-files + vm-spooled-mail-waiting-hook vm-startup-with-summary vm-strip-reply-headers + vm-subject-significant-chars vm-summary-arrow *************** *** 1004,1005 **** --- 1019,1021 ---- 'vm-imap-messages-per-session + 'vm-imap-session-preauth-hook 'vm-in-reply-to-format *************** *** 1036,1041 **** 'vm-mime-base64-encoder-switches - 'vm-mime-button-format-alist 'vm-mime-button-face 'vm-mime-charset-font-alist 'vm-mime-default-face-charsets 'vm-mime-digest-discard-header-regexp --- 1052,1062 ---- 'vm-mime-base64-encoder-switches 'vm-mime-button-face + 'vm-mime-button-format-alist 'vm-mime-charset-font-alist + 'vm-mime-confirm-delete + 'vm-mime-decode-for-preview + 'vm-mime-default-face-charset-exceptions 'vm-mime-default-face-charsets + 'vm-mime-delete-after-saving + 'vm-mime-delete-viewer-processes 'vm-mime-digest-discard-header-regexp *************** *** 1048,1050 **** --- 1069,1077 ---- 'vm-mime-max-message-size + 'vm-mime-qp-decoder-program + 'vm-mime-qp-decoder-switches + 'vm-mime-qp-encoder-program + 'vm-mime-qp-encoder-switches 'vm-mime-type-converter-alist + 'vm-mime-uuencode-decoder-program + 'vm-mime-uuencode-decoder-switches 'vm-mode-hook *************** *** 1062,1063 **** --- 1089,1091 ---- 'vm-netscape-program-switches + 'vm-paragraph-fill-column ;; POP passwords might be listed here *************** *** 1104,1107 **** --- 1132,1137 ---- 'vm-spool-file-suffixes + 'vm-spooled-mail-waiting-hook 'vm-startup-with-summary 'vm-strip-reply-headers + 'vm-subject-significant-chars 'vm-summary-format *** dist/vm-vars.el.dist Fri May 21 01:07:46 1999 --- vm-vars.el Fri Jul 23 15:53:16 1999 *************** *** 610,611 **** --- 610,617 ---- + (defvar vm-mime-decode-for-preview t + "*Non-nil value causes MIME deocding to happen when a message + is previewed, instead of when it is displayed in full. + `vm-auto-decode-mime-messages' must also be set non-nil for + this variable to have effect.") + (defvar vm-auto-displayed-mime-content-types '("text" "multipart") *************** *** 748,749 **** --- 754,760 ---- + (defvar vm-mime-delete-viewer-processes t + "*Non-nil value causes VM to kill external MIME viewer processes + when you switch to a different message or quit the current message's + folder.") + (defvar vm-mime-type-converter-alist nil *************** *** 3148,3149 **** --- 3159,3162 ---- ("vm-create-virtual-folder") + ("vm-create-virtual-folder-same-author") + ("vm-create-virtual-folder-same-subject") ("vm-decode-mime-message") *************** *** 3152,3153 **** --- 3165,3167 ---- ("vm-delete-message-labels") + ("vm-delete-mime-object") ("vm-discard-cached-data") *************** *** 3160,3161 **** --- 3174,3177 ---- ("vm-expunge-folder") + ("vm-expunge-imap-messages") + ("vm-expunge-pop-messages") ("vm-followup") *************** *** 3184,3185 **** --- 3200,3202 ---- ("vm-mark-matching-messages") + ("vm-mark-matching-messages-with-virtual-folder") ("vm-mark-message") *************** *** 3189,3190 **** --- 3206,3211 ---- ("vm-mark-thread-subtree") + ("vm-mime-attach-buffer") + ("vm-mime-attach-file") + ("vm-mime-attach-message") + ("vm-mime-attach-mime-file") ("vm-mode") *************** *** 3242,3243 **** --- 3263,3265 ---- ("vm-summarize-other-frame") + ("vm-toggle-all-marks") ("vm-toggle-read-only") *************** *** 3247,3248 **** --- 3269,3271 ---- ("vm-unmark-matching-messages") + ("vm-unmark-matching-messages-with-virtual-folder") ("vm-unmark-message") *** dist/vm-version.el.dist Fri May 21 01:07:46 1999 --- vm-version.el Tue Jul 27 10:38:27 1999 *************** *** 4,6 **** ! (defconst vm-version "6.72" "Version number of VM.") --- 4,6 ---- ! (defconst vm-version "6.73" "Version number of VM.")