sendmail.el

sendmail.el

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

This fixes a bug I ran across today.  My sources are from July,
but the bug may be present in the Emacs 25.1 code.  Please check.

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 58f708a..3d22209 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1110,10 +1110,11 @@ mail-combine-fields
               (save-restriction
                 ;; This is just so the screen doesn't change.
                 (narrow-to-region (point-min) old-max)
-                (goto-char old-point)
-                (setq query-asked t)
-                (if (y-or-n-p (format "Message contains multiple %s fields.  Combine? " field))
-                    (setq query-answer t))))
+                (save-excursion
+                  (goto-char old-point)
+                  (setq query-asked t)
+                  (if (y-or-n-p (format "Message contains multiple %s fields.  Combine? " field))
+                      (setq query-answer t)))))
             (when query-answer
               (let ((this-to-start (line-beginning-position))
                     this-to-end


-- 
Dr Richard Stallman
President, Free Software Foundation (gnu.org, fsf.org)
Internet Hall-of-Famer (internethalloffame.org)
Skype: No way! See stallman.org/skype.html.

Re: sendmail.el

[Nicolas Petton]

[-- Attachment #1: Type: text/plain, Size: 239 bytes --]

Richard Stallman <rms@gnu.org> writes:

Hi Richard,

> This fixes a bug I ran across today.  My sources are from July,
> but the bug may be present in the Emacs 25.1 code.  Please check.

Could you describe the bug it fixes?

Thanks,
Nico

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 512 bytes --]

Re: sendmail.el

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

  > Could you describe the bug it fixes?

When it happened to me, it combined the From field with the To field.
It is supposed to combine only multiple To fields, multiple CC fields, etc.

-- 
Dr Richard Stallman
President, Free Software Foundation (gnu.org, fsf.org)
Internet Hall-of-Famer (internethalloffame.org)
Skype: No way! See stallman.org/skype.html.

Re: sendmail.el

[Noam Postavsky]

> This fixes a bug I ran across today.  My sources are from July,
> but the bug may be present in the Emacs 25.1 code.  Please check.
>
> diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
> index 58f708a..3d22209 100644
> --- a/lisp/mail/sendmail.el
> +++ b/lisp/mail/sendmail.el
> @@ -1110,10 +1110,11 @@ mail-combine-fields
>                (save-restriction
>                  ;; This is just so the screen doesn't change.
>                  (narrow-to-region (point-min) old-max)
> -                (goto-char old-point)
> -                (setq query-asked t)
> -                (if (y-or-n-p (format "Message contains multiple %s fields.  Combine? " field))
> -                    (setq query-answer t))))
> +                (save-excursion
> +                  (goto-char old-point)
> +                  (setq query-asked t)
> +                  (if (y-or-n-p (format "Message contains multiple %s fields.  Combine? " field))
> +                      (setq query-answer t)))))

The wrapping of y-or-n-p with a save-excursion sounds similar to #2209
"copyright-update might not update copyright", I was thinking it might
be a case of a window point being different from the buffer point that
causes the unexpected move.

Re: sendmail.el

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

I think the problem is simply that old-point is the wrong place for
point to remain at.  It needs to go back where it was in the search
loop, but old-point is where it was on entry to the function.

-- 
Dr Richard Stallman
President, Free Software Foundation (gnu.org, fsf.org)
Internet Hall-of-Famer (internethalloffame.org)
Skype: No way! See stallman.org/skype.html.

Re: sendmail.el

[Noam Postavsky]

On Thu, Aug 25, 2016 at 6:20 PM, Richard Stallman <rms@gnu.org> wrote:
> I think the problem is simply that old-point is the wrong place for
> point to remain at.  It needs to go back where it was in the search
> loop, but old-point is where it was on entry to the function.

Yes, after looking more at the surrounding code, I concur.

Re: sendmail.el

[Eli Zaretskii]

> From: Noam Postavsky <npostavs@users.sourceforge.net>
> Date: Fri, 26 Aug 2016 23:04:55 -0400
> Cc: Emacs developers <emacs-devel@gnu.org>
> 
> On Thu, Aug 25, 2016 at 6:20 PM, Richard Stallman <rms@gnu.org> wrote:
> > I think the problem is simply that old-point is the wrong place for
> > point to remain at.  It needs to go back where it was in the search
> > loop, but old-point is where it was on entry to the function.
> 
> Yes, after looking more at the surrounding code, I concur.

Please push, and thanks.

Re: sendmail.el

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

This patch may be needed in Emacs 25.  Would someone please check?

-- 
Dr Richard Stallman
President, Free Software Foundation (gnu.org, fsf.org)
Internet Hall-of-Famer (internethalloffame.org)
Skype: No way! See stallman.org/skype.html.

Re: sendmail.el

[Noam Postavsky]

On Sat, Aug 27, 2016 at 5:46 PM, Richard Stallman <rms@gnu.org> wrote:
> This patch may be needed in Emacs 25.  Would someone please check?

The function `mail-combine-fields' hasn't changed since you introduced
it in 79a16968 Wed Aug 12 11:25:26 2015 "Offer to combine multiple To
or CC fields[...]". So the bug is present on both emacs-25 and master
branches. But I guess it's too late to fix for 25.1 by now.

Re: sendmail.el

[John Wiegley]

>>>>> "NP" == Noam Postavsky <npostavs@users.sourceforge.net> writes:

NP> The function `mail-combine-fields' hasn't changed since you introduced it
NP> in 79a16968 Wed Aug 12 11:25:26 2015 "Offer to combine multiple To or CC
NP> fields[...]". So the bug is present on both emacs-25 and master branches.
NP> But I guess it's too late to fix for 25.1 by now.

Yes, it is too late, harmless thought it may be. Accepting it in 25.1 would
mean another release candidate, and another round of waiting, which I'd like
to avoid except for truly damaging bugs.

-- 
John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2

Re: sendmail.el

[Noam Postavsky]

On Sat, Aug 27, 2016 at 10:01 PM, John Wiegley <jwiegley@gmail.com> wrote:
>>>>>> "NP" == Noam Postavsky <npostavs@users.sourceforge.net> writes:
>
> NP> The function `mail-combine-fields' hasn't changed since you introduced it
> NP> in 79a16968 Wed Aug 12 11:25:26 2015 "Offer to combine multiple To or CC
> NP> fields[...]". So the bug is present on both emacs-25 and master branches.
> NP> But I guess it's too late to fix for 25.1 by now.
>
> Yes, it is too late, harmless thought it may be. Accepting it in 25.1 would
> mean another release candidate, and another round of waiting, which I'd like
> to avoid except for truly damaging bugs.
>

I've pushed to master as 5fbba6cc "Fix mail-combine-fields".