Fix handling of arbitrary YANK-ACTION functions from compose-mail.

* mail/sendmail.el (mail-yank-original): Set the mark if the
specified function for yanking does not do it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d3b9a27a09215d9803c238174b21e4cbaf97fb05..81a5e1c9f533be9f676b7be8fdb06cab76c737c2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-17  Chong Yidong  <cyd@stupidchicken.com>
+
+       * mail/sendmail.el (mail-yank-original): Set the mark if the
+       specified function for yanking does not do it.
+
 2010-01-17  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * vc.el (with-vc-properties): Deal with directory arguments.  (Bug#5298)

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 7004133f5842324bfe5c73093e0f6a3dc6880792..da8fe85da82e538db4084f280fb8d7db0166e487 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1505,14 +1505,18 @@ and don't delete any header fields."
   (interactive "P")
   (if mail-reply-action
       (let ((start (point))
-           (original mail-reply-action))
+           (original mail-reply-action)
+           (omark (mark t)))
        (and (consp original) (eq (car original) 'insert-buffer)
             (setq original (nth 1 original)))
        (if (consp original)
-           (apply (car original) (cdr original))
-         ;; If the original message is in another window in the same frame,
-         ;; delete that window to save screen space.
-         ;; t means don't alter other frames.
+           (progn
+             ;; Call yank function, and set the mark if it doesn't.
+             (apply (car original) (cdr original))
+             (if (eq omark (mark t))
+                 (push-mark (point))))
+         ;; If the original message is in another window in the same
+         ;; frame, delete that window to save space.
          (delete-windows-on original t)
          (with-no-warnings
            ;; We really want this to set mark.