Fix "C-c C-r" in mail-mode invoked from Rmail.

 lisp/mail/sendmail.el (mail-yank-region): Recognize
 rmail-yank-current-message in addition to insert-buffer.  Fixes
 mail-mode's "C-c C-r" that otherwise does nothing when invoked in
 a *mail* buffer created through rmail-start-mail with sendmail as
 mail-user-agent.

2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac5783b7951..5b27dcfb52e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2012-05-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * mail/sendmail.el (mail-yank-region): Recognize
+        rmail-yank-current-message in addition to insert-buffer.  Fixes
+        mail-mode's "C-c C-r" that otherwise does nothing when invoked in
+        a *mail* buffer created through rmail-start-mail with sendmail as
+        mail-user-agent.
+
 2012-05-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/cl-macs.el (cl-transform-lambda): Don't add spurious
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 1ecae9faa59..5ae4c44060f 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1679,7 +1679,8 @@ Just \\[universal-argument] as argument means don't indent, insert no prefix,
 and don't delete any header fields."
   (interactive "P")
   (and (consp mail-reply-action)
-       (eq (car mail-reply-action) 'insert-buffer)
+       (memq (car mail-reply-action)
+             '(rmail-yank-current-message insert-buffer))
        (with-current-buffer (nth 1 mail-reply-action)
          (or (mark t)
              (error "No mark set: %S" (current-buffer))))