# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1249666190 0
# Node ID 09b0d63f50d1769a9b4f6ddb148bd53462df2c54
# Parent  bd1307aab3def62629a9ca7d78d546238bce8f1b
(mail-yank-original): Set buffer-file-coding-system from the one used
by the message whose text is yanked.

diff -r bd1307aab3de -r 09b0d63f50d1 lisp/mail/sendmail.el
--- a/lisp/mail/sendmail.el	Fri Aug 07 15:22:29 2009 +0000
+++ b/lisp/mail/sendmail.el	Fri Aug 07 17:29:50 2009 +0000
@@ -1506,7 +1506,19 @@
 	  (delete-windows-on original t)
 	  (with-no-warnings
 	    ;; We really want this to set mark.
-	    (insert-buffer original))
+	    (insert-buffer original)
+	    ;; If they yank the original text, the encoding of the
+	    ;; original message is a better default than
+	    ;; default-buffer-file-coding-system.
+	    (and (coding-system-equal
+		  (default-value 'buffer-file-coding-system)
+		  buffer-file-coding-system)
+		 (setq buffer-file-coding-system
+		       (coding-system-change-text-conversion
+			buffer-file-coding-system
+			(coding-system-base
+			 (with-current-buffer original
+			   buffer-file-coding-system))))))
 	  (set-text-properties (point) (mark t) nil))
 	(if (consp arg)
 	    nil