xemacs-beta: lisp/vm/vm-reply.el comparison

comparison lisp/vm/vm-reply.el @ 54:05472e90ae02 r19-16-pre2

Import from CVS: tag r19-16-pre2

author	cvs
date	Mon, 13 Aug 2007 08:57:55 +0200
parents	c53a95d3c46d
children	131b0175ea99

comparison

equal deleted inserted replaced

-:875393c1a535
+:05472e90ae02
 	      (cond ((vm-mime-types-match "multipart" type)
 		     (setq parts (copy-sequence (vm-mm-layout-parts o))))
 		    (t (setq parts (list o))))
 	      (while parts
 		(cond ((vm-mime-text-type-p (car parts))
-		       (if (vm-mime-display-internal-text/plain (car parts) t)
+		       (if (cond ((vm-mime-types-match
+				   "text/html"
+				   (car (vm-mm-layout-type (car parts))))
+				  (vm-mime-display-internal-text/html
+				   (car parts)))
+				 ((vm-mime-types-match
+				   "text/enriched"
+				   (car (vm-mm-layout-type (car parts))))
+				  (vm-mime-display-internal-text/enriched
+				   (car parts)))
+				 ((vm-mime-display-internal-text/plain
+				   (car parts) t)))
 			   nil
 			 ;; charset problems probably
 			 ;; just dump the raw bits
 			 (vm-mime-insert-mime-body (car parts))
 			 (vm-mime-transfer-decode-region (car parts)
 (interactive "P")
 (vm-check-for-killed-folder)
 (let ((b (current-buffer)))
 (vm-mail-send)
 (cond ((null (buffer-name b)) ;; dead buffer
+	   ;; This improves window configuration behavior in
+	   ;; XEmacs.  It avoids taking the folder buffer from
+	   ;; one frame and attaching it to the selected frame.
+	   (set-buffer (window-buffer (selected-window)))
 	   (vm-display nil nil '(vm-mail-send-and-exit)
 		       '(vm-mail-send-and-exit
 			 reading-message
 			 startup)))
 	  (t
 (if (not (eq vm-keep-sent-messages t))
 (let ((extras (nthcdr (or vm-keep-sent-messages 0)
 				vm-kept-mail-buffers)))
 	(mapcar (function
 		 (lambda (b)
-		   (and (buffer-name b) (kill-buffer b))))
+		   (and (buffer-name b)
+			(not (buffer-modified-p b))
+			(kill-buffer b))))
 		extras)
 	(and vm-kept-mail-buffers extras
 	     (setcdr (memq (car extras) vm-kept-mail-buffers) nil)))))
 (defun vm-help-tale ()
 ;;
 ;; also protect value of this-command from minibuffer reads
 (let ((this-command this-command))
 	(save-excursion
 	  (mail-send))))
-(cond ((eq vm-system-state 'replying)
-	   (vm-mail-mark-replied))
-	  ((eq vm-system-state 'forwarding)
-	   (vm-mail-mark-forwarded))
-	  ((eq vm-system-state 'redistributing)
-	   (vm-mail-mark-redistributed)))
 ;; be careful, something could have killed the composition
 ;; buffer inside mail-send.
 (if (eq (current-buffer) composition-buffer)
 	(progn
+	  (cond ((eq vm-system-state 'replying)
+		 (vm-mail-mark-replied))
+		((eq vm-system-state 'forwarding)
+		 (vm-mail-mark-forwarded))
+		((eq vm-system-state 'redistributing)
+		 (vm-mail-mark-redistributed)))
 	  (vm-rename-current-mail-buffer)
 	  (vm-keep-mail-buffer (current-buffer))))
 (vm-display nil nil '(vm-mail-send) '(vm-mail-send))))
 (defun vm-mail-mode-get-header-contents (header-name-regexp)
 (interactive)
 (vm-follow-summary-cursor)
 (vm-select-folder-buffer)
 (vm-check-for-killed-summary)
 (vm-error-if-folder-empty)
-(if (eq last-command 'vm-next-command-uses-marks)
+(if (and (eq last-command 'vm-next-command-uses-marks)
+	   (cdr (vm-select-marked-or-prefixed-messages 0)))
 (let ((vm-digest-send-type vm-forwarding-digest-type))
 	(setq this-command 'vm-next-command-uses-marks)
 	(command-execute 'vm-send-digest))
 (let ((dir default-directory)
 	  (miming (and vm-send-using-mime
 		       (equal vm-forwarding-digest-type "mime")))
 	  mail-buffer
-	  header-end boundary
+	  header-end
-	  (mp vm-message-pointer))
+	  (mp (vm-select-marked-or-prefixed-messages 1)))
 (save-restriction
 	(widen)
 	(vm-mail-internal
 	 (format "forward of %s's note re: %s"
 		 (vm-su-full-name (car vm-message-pointer))
 	  (re-search-forward (concat "^" (regexp-quote mail-header-separator)
 				     "\n"))
 	  (goto-char (match-end 0))
 	  (setq header-end (match-beginning 0)))
 	(cond ((equal vm-forwarding-digest-type "mime")
-	       (setq boundary (vm-mime-encapsulate-messages
+	       (vm-mime-encapsulate-messages (list (car mp))
-			       (list (car mp)) vm-forwarded-headers
+					     vm-forwarded-headers
-			       vm-unforwarded-header-regexp))
+					     vm-unforwarded-header-regexp
+					     nil)
 	       (goto-char header-end)
 	       (insert "MIME-Version: 1.0\n")
-	       (insert (if vm-mime-avoid-folding-content-type
+	       (insert "Content-Type: message/rfc822\n")
-			   "Content-Type: multipart/digest; boundary=\""
-			 "Content-Type: multipart/digest;\n\tboundary=\"")
-		       boundary "\"\n")
 	       (insert "Content-Transfer-Encoding: "
 		       (vm-determine-proper-content-transfer-encoding
 			(point)
 			(point-max))
 		       "\n"))
 		vm-unforwarded-header-regexp)))
 (if miming
 	  (let ((b (current-buffer)))
 	    (set-buffer mail-buffer)
 	    (mail-text)
-	    (vm-mime-attach-object b "multipart/digest"
+	    (vm-mime-attach-object b "message/rfc822" nil nil t)
-				   (list (concat "boundary=\""
-						 boundary "\"")) nil t)
 	    (add-hook 'kill-buffer-hook
 		      (list 'lambda ()
 			    (list 'if (list 'eq mail-buffer '(current-buffer))
 				  (list 'kill-buffer b))))))
 	(mail-position-on-field "To"))
 (defun vm-resend-message ()
 "Resend the current message to someone else.
 The current message will be copied to a Mail mode buffer and you
 can edit the message and send it as usual.
-NOTE: since you are doing a resend, a Resent-To header is
+NOTE: since you are doing a resend, a Resent-To header is provided
-provided for you to fill in.  If you don't fill it in, when you
+for you to fill in the new recipient list.  If you don't fill in
-send the message it will go to the original recipients listed in
+this header, what happens when you send the message is undefined.
-the To and Cc headers.  You may also create a Resent-Cc header."
+You may also create a Resent-Cc header."
 (interactive)
 (vm-follow-summary-cursor)
 (vm-select-folder-buffer)
 (vm-check-for-killed-summary)
 (vm-error-if-folder-empty)
 	      header-end (match-beginning 0)))
 (message "Building %s digest..." vm-digest-send-type)
 (cond ((equal vm-digest-send-type "mime")
 	     (setq boundary (vm-mime-encapsulate-messages
 			     mlist vm-mime-digest-headers
-			     vm-mime-digest-discard-header-regexp))
+			     vm-mime-digest-discard-header-regexp
+			     t))
 	     (goto-char header-end)
 	     (insert "MIME-Version: 1.0\n")
 	     (insert (if vm-mime-avoid-folding-content-type
 			 "Content-Type: multipart/digest; boundary=\""
 		       "Content-Type: multipart/digest;\n\tboundary=\"")
 	     (vm-rfc1153-encapsulate-messages
 	      mlist vm-rfc1153-digest-headers
 	      vm-rfc1153-digest-discard-header-regexp)))
 (goto-char start)
 (setq mp mlist)
-(if prefix
-	  (progn
-	    (message "Building digest preamble...")
-	    (while mp
-	      (let ((vm-summary-uninteresting-senders nil))
-		(insert (vm-sprintf 'vm-digest-preamble-format (car mp)) "\n"))
-	      (if vm-digest-center-preamble
-		  (progn
-		    (forward-char -1)
-		    (center-line)
-		    (forward-char 1)))
-	      (setq mp (cdr mp)))))
 (if miming
 	  (let ((b (current-buffer)))
 	    (set-buffer mail-buffer)
 	    (mail-text)
 	    (vm-mime-attach-object b "multipart/digest"
 						 boundary "\"")) nil t)
 	    (add-hook 'kill-buffer-hook
 		      (list 'lambda ()
 			    (list 'if (list 'eq mail-buffer '(current-buffer))
 				  (list 'kill-buffer b))))))
+(if prefix
+	  (save-excursion
+	    (message "Building digest preamble...")
+	    (if miming
+		(progn
+		  (set-buffer mail-buffer)
+		  (mail-text)))
+	    (while mp
+	      (let ((vm-summary-uninteresting-senders nil))
+		(insert (vm-sprintf 'vm-digest-preamble-format (car mp)) "\n"))
+	      (if vm-digest-center-preamble
+		  (progn
+		    (forward-char -1)
+		    (center-line)
+		    (forward-char 1)))
+	      (setq mp (cdr mp)))))
 (mail-position-on-field "To")
 (message "Building %s digest... done" vm-digest-send-type)))
 (run-hooks 'vm-send-digest-hook)
 (run-hooks 'vm-mail-mode-hook))
 	(progn
 	  ;; avoid having the window configuration code choose a
 	  ;; different composition buffer.
 	  (vm-unbury-buffer b)
 	  (set-buffer b)
-	  (if (and vm-frame-per-composition (vm-multiple-frames-possible-p)
+	  (if (and vm-mutable-frames vm-frame-per-composition
+		   (vm-multiple-frames-possible-p)
 		   ;; only pop up a frame if there's an undisplay
 		   ;; hook in place to make the frame go away.
 		   vm-undisplay-buffer-hook)
 	      (let ((w (vm-get-buffer-window b)))
 		(if (null w)
 (if (fboundp 'mail-aliases-setup) ; use mail-abbrevs.el if present
 	(mail-aliases-setup)
 (if (eq mail-aliases t)
 	  (progn
 	    (setq mail-aliases nil)
-	    (if (file-exists-p "~/.mailrc")
+	    (if (file-exists-p (or mail-personal-alias-file "~/.mailrc"))
 		(build-mail-aliases)))))
 (if (stringp vm-mail-header-from)
 	(insert "From: " vm-mail-header-from "\n"))
 (insert "To: " (or to "") "\n")
 (and cc (insert "Cc: " cc "\n"))
 (insert "Subject: " (or subject "") "\n")
 (and newsgroups (insert "Newsgroups: " newsgroups "\n"))
 (and in-reply-to (insert "In-Reply-To: " in-reply-to "\n"))
 (and references (insert "References: " references "\n"))
 (insert "X-Mailer: VM " vm-version " under "
-	    (if (vm-fsfemacs-19-p) "Emacs " "")
+	    (if vm-fsfemacs-19-p "Emacs " "")
 	    emacs-version "\n")
-;; REPLYTO support for FSF Emacs v19.29
+;; REPLYTO environmental variable support
-(and (eq mail-default-reply-to t)
+;; note that in FSF Emacs v19.29 we would initialize if the
+;; value was t.  nil is the treigger value used now.
+(and (eq mail-default-reply-to nil)
 	 (setq mail-default-reply-to (getenv "REPLYTO")))
 (if mail-default-reply-to
 	(insert "Reply-To: " mail-default-reply-to "\n"))
 (if mail-self-blind
 	(insert "Bcc: " (user-login-name) "\n"))
 				       "~/.signature")))))
 ;; move this buffer to the head of the buffer list so window
 ;; config stuff will select it as the composition buffer.
 (vm-unbury-buffer (current-buffer))
 ;; make a new frame if the user wants it.
-(if (and vm-frame-per-composition (vm-multiple-frames-possible-p))
+(if (and vm-mutable-frames vm-frame-per-composition
+	     (vm-multiple-frames-possible-p))
 	(progn
 	  (vm-goto-new-frame 'composition)
 	  (vm-set-hooks-for-frame-deletion)))
 ;; now do window configuration
 (vm-display (current-buffer) t

Mercurial > hg > xemacs-beta

comparison lisp/vm/vm-reply.el @ 54:05472e90ae02 r19-16-pre2