[Emacs-diffs] emacs/lisp/mail sendmail.el

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    09/08/07 17:29:50

Modified files:
        lisp/mail      : sendmail.el 

Log message:
        (mail-yank-original): Set buffer-file-coding-system from the one used
        by the message whose text is yanked.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/sendmail.el?cvsroot=emacs&r1=1.327&r2=1.328

Patches:
Index: sendmail.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mail/sendmail.el,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -b -r1.327 -r1.328
--- sendmail.el 9 Apr 2009 16:33:45 -0000       1.327
+++ sendmail.el 7 Aug 2009 17:29:50 -0000       1.328
@@ -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