[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108006: Fix "C-c C-r" in mail-mode invoked from Rmail.

[Eli Zaretskii]

------------------------------------------------------------
revno: 108006
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-05-18 12:41:42 +0300
message:
  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.
modified:
  lisp/ChangeLog
  lisp/mail/sendmail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-17 15:17:53 +0000
+++ b/lisp/ChangeLog    2012-05-18 09:41:42 +0000
@@ -1,3 +1,11 @@
+2012-05-18  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * emacs-lisp/cl-macs.el (cl-transform-lambda): Don't add spurious

=== modified file 'lisp/mail/sendmail.el'
--- a/lisp/mail/sendmail.el     2012-04-20 19:17:59 +0000
+++ b/lisp/mail/sendmail.el     2012-05-18 09:41:42 +0000
@@ -1679,7 +1679,8 @@
 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))))