# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 737752873 0
# Node ID ef942eda352315e154952b7f295b450b5f23b369
# Parent  00029a6ad94c151231740daa3bed8e49cd998b04
(mail-yank-original): In Transient Mark mode,
don't get error and don't activate the mark.

diff -r 00029a6ad94c -r ef942eda3523 lisp/mail/sendmail.el
--- a/lisp/mail/sendmail.el	Tue May 18 15:46:30 1993 +0000
+++ b/lisp/mail/sendmail.el	Tue May 18 19:21:13 1993 +0000
@@ -565,16 +565,20 @@
 	(insert-buffer mail-reply-buffer)
 	(if (consp arg)
 	    nil
-	  (mail-yank-clear-headers start (mark))
+	  (mail-yank-clear-headers start (mark t))
 	  (if (null mail-yank-prefix)
-	      (indent-rigidly start (mark)
+	      (indent-rigidly start (mark t)
 			      (if arg (prefix-numeric-value arg) 3))
 	    (save-excursion
 	      (goto-char start)
-	      (while (< (point) (mark))
+	      (while (< (point) (mark t))
 		(insert mail-yank-prefix)
 		(forward-line 1)))))
-	(exchange-point-and-mark)
+	;; This is like exchange-point-and-mark, but doesn't activate the mark.
+	;; It is cleaner to avoid activation, even though the command
+	;; loop would deactivate the mark because we inserted text.
+	(goto-char (prog1 (mark t)
+		     (set-marker (mark-marker) (point) (current-buffer))))
 	(if (not (eolp)) (insert ?\n)))))
 
 (defun mail-yank-clear-headers (start end)