bug#11660: 24.1; Supercite doesn't work with RMAIL in 24.1

bug#11660: 24.1; Supercite doesn't work with RMAIL in 24.1

[Kenichi Handa]

With the release candidata of 24.1, supercite doesn't work
with RMAIL.  This is what I tried:

# In RMAIL buffer showing a message from Kenichi Handa (it's me):
r
# Now I'm in "*unsent mail to Kenichi*".
C-c C-y
# The buffer shows the original message (head and body), and
# the minibuffer prompts "Complete attribution name:" and
# shows the default input "Anon".
RET
# The "*unsent..." buffer inserts " writes" at the first line
# of the composing body, and the following lines are not
# cited by "> ".

Previously (in Emacs 23), C-c C-y RET inserts this line at
the first line:
  "In article <87boks4k41.fsf@gnu.org>, Kenichi Handa <handa@gnu.org> writes:"
and the following lines (containing only the body of the
original) are cited properly.

My .emacs contains this mail-related settings.

(custom-set-variables
 ;; custom-set-variables was added by Custom.
 ;; If you edit it by hand, you could mess it up, so be careful.
 ;; Your init file should contain only one such instance.
 ;; If there is more than one, they won't work right.
 '(mail-citation-hook (quote (sc-cite-original)))
 '(mail-host-address "gnu.org")
 '(mail-user-agent (quote message-user-agent))
 '(rmail-movemail-flags (quote ("--tls")))
 '(rmail-movemail-program "/usr/bin/movemail")
 '(rmail-remote-password-required t)
 '(sc-auto-fill-region-p nil)
 '(sc-citation-delimiter-regexp "[^-][>]+")
 '(sc-citation-leader "")
 '(sc-nested-citation-p t)
 '(sc-preferred-header-style 2)
 '(sc-reference-tag-string "")
 '(send-mail-function (quote smtpmail-send-it))
 '(sendmail-query-once-function (quote smtpmail-send-it) t)
 '(smtpmail-smtp-server "fencepost.gnu.org")
 '(smtpmail-smtp-service "smtp")
 '(smtpmail-smtp-user "handa"))


---
Kenichi Handa
handa@m17n.org

In GNU Emacs 24.1.1 (i686-pc-linux-gnu, X toolkit, Xaw scroll bars)
 of 2012-06-09 on ubuntu
Windowing system distributor `The X.Org Foundation', version 11.0.10706000
Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: nil
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: ja_JP.utf8
  value of $XMODIFIERS: @im=ibus
  locale-coding-system: utf-8-unix
  default enable-multibyte-characters: t

Major mode: Lisp Interaction

Minor modes in effect:
  display-time-mode: t
  tooltip-mode: t
  mouse-wheel-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  line-number-mode: t

Recent input:
M-r C-c C-y r C-c C-y <return> <help-echo> <down-mouse-1> 
<mouse-1> C-/ C-/ C-/ C-/ C-x k <return> C-x b * <tab> 
<tab> C-a C-k <tab> <tab> C-g <down-mouse-1> <mouse-1> 
C-x o M-x r e p o <tab> r <tab> <return>

Recent messages:
For information about GNU Emacs and the GNU system, type C-h C-a.
Counting messages...done
(No new mail has arrived)
0 new messages read
Mark set [2 times]
Undo! [3 times]
undo-more: No further undo information
Making completion list...
Quit
Making completion list...

Load-path shadows:
None found.

Features:
(shadow sort emacsbug help-mode view supercite easy-mmode
regi gnus-util mail-extr rmailmm message format-spec rfc822
mml mml-sec mm-decode mm-bodies mm-encode mailabbrev
gmm-utils mailheader mail-parse rfc2231 time sendmail
regexp-opt rmail-spam-filter easymenu rmailsum rmail rfc2047
rfc2045 ietf-drums mm-util mail-prsvr mail-utils time-date
japan-util tooltip ediff-hook vc-hooks lisp-float-type
mwheel x-win x-dnd tool-bar dnd fontset image fringe
lisp-mode register page menu-bar rfn-eshadow timer select
scroll-bar mouse jit-lock font-lock syntax facemenu
font-core frame cham georgian utf-8-lang misc-lang
vietnamese tibetan thai tai-viet lao korean japanese hebrew
greek romanian slovak czech european ethiopic indian
cyrillic chinese case-table epa-hook jka-cmpr-hook help
simple abbrev minibuffer loaddefs button faces cus-face
files text-properties overlay sha1 md5 base64 format env
code-pages mule custom widget hashtable-print-readable
backquote make-network-process dynamic-setting
font-render-setting x-toolkit x multi-tty emacs)

bug#11660: 24.1; Supercite doesn't work with RMAIL in 24.1

[Eli Zaretskii]

> From: Kenichi Handa <handa@gnu.org>
> Date: Sun, 10 Jun 2012 00:16:47 +0900
> 
> With the release candidata of 24.1, supercite doesn't work
> with RMAIL.  This is what I tried:
> 
> # In RMAIL buffer showing a message from Kenichi Handa (it's me):
> r
> # Now I'm in "*unsent mail to Kenichi*".
> C-c C-y
> # The buffer shows the original message (head and body), and
> # the minibuffer prompts "Complete attribution name:" and
> # shows the default input "Anon".
> RET
> # The "*unsent..." buffer inserts " writes" at the first line
> # of the composing body, and the following lines are not
> # cited by "> ".
> 
> Previously (in Emacs 23), C-c C-y RET inserts this line at
> the first line:
>   "In article <87boks4k41.fsf@gnu.org>, Kenichi Handa <handa@gnu.org> writes:"
> and the following lines (containing only the body of the
> original) are cited properly.

Whatever is done to fix this, _please_ test the changes, if any, also
with mail-user-agent set to sendmail-user-agent.  Too many times this
configuration was broken during the last stages of pretest by changes
to either rmail*.el or sendmail.el, which suggests that the changes
are only tested with the default mail-user-agent.

TIA

bug#11660: 24.1; Supercite doesn't work with RMAIL in 24.1

[Eli Zaretskii]

> From: Kenichi Handa <handa@gnu.org>
> Date: Sun, 10 Jun 2012 00:16:47 +0900
> 
> With the release candidata of 24.1, supercite doesn't work
> with RMAIL.

I think this happens because "C-c C-y" now invokes
rmail-yank-current-message, which doesn't run mail-citation-hook.  Can
you verify that rmail-yank-current-message is indeed invoked when you
type "C-c C-y", and also that a different function was invoked in
Emacs 23?

bug#11660: 24.1; Supercite doesn't work with RMAIL in 24.1

[Glenn Morris]

Kenichi Handa wrote:

> With the release candidata of 24.1, supercite doesn't work
> with RMAIL.

This simple patch fixes it. Tested with and without supercite, and with
sendmail- and message- user-agents.

To test, apply the 4 possible forms for eval:

emacs -Q --eval "(progn (add-hook 'mail-citation-hook 'sc-cite-original)
                        (setq mail-user-agent 'sendmail-user-agent))"

C-u M-x rmail RET /path/to/mbox RET
r
C-c C-y

(The message and mail citation commands leave point in different
positions, but they did in 23.4 too.)

Should this be installed in emacs-24?

*** lisp/mail/rmail.el	2012-05-04 11:17:28 +0000
--- lisp/mail/rmail.el	2012-06-09 18:19:56 +0000
***************
*** 3567,3573 ****
    (with-current-buffer buffer
      (unless (rmail-buffers-swapped-p)
        (setq buffer rmail-view-buffer)))
!   (insert-buffer buffer)
    ;; If they yank the text of BUFFER, the encoding of BUFFER is a
    ;; better default for the reply message than the default value of
    ;; buffer-file-coding-system.
--- 3567,3573 ----
    (with-current-buffer buffer
      (unless (rmail-buffers-swapped-p)
        (setq buffer rmail-view-buffer)))
!   (insert-buffer-substring buffer)
    ;; If they yank the text of BUFFER, the encoding of BUFFER is a
    ;; better default for the reply message than the default value of
    ;; buffer-file-coding-system.

bug#11660: 24.1; Supercite doesn't work with RMAIL in 24.1

[Chong Yidong]

Glenn Morris <rgm@gnu.org> writes:

> This simple patch fixes it. Tested with and without supercite, and with
> sendmail- and message- user-agents.
>
> Should this be installed in emacs-24?

Please install it.  Thanks.

bug#11660: 24.1; Supercite doesn't work with RMAIL in 24.1

[Glenn Morris]

Version: 24.1

Chong Yidong wrote:

>> Should this be installed in emacs-24?
>
> Please install it.  Thanks.

Done. I faked the ChangeLog date to put it before the release
announcement. I don't know if you plan to adjust those dates.

bug#11660: 24.1; Supercite doesn't work with RMAIL in 24.1

[Kenichi Handa]

In article <pqehpobapp.fsf@fencepost.gnu.org>, Glenn Morris <rgm@gnu.org> writes:

> This simple patch fixes it. Tested with and without supercite, and with
> sendmail- and message- user-agents.

I confirmed that the patch surely fixes the bug in my
environment, thank you!

---
Kenichi Handa
handa@m17n.org