From: Richard Stallman <rms@gnu.org>
Date: Sat, 3 Sep 2016 01:55:09 +0000 (-0400)
Subject: Fix mail-combine-fields
X-Git-Tag: emacs-25.1.91~44
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=95eb641;p=emacs.git

Fix mail-combine-fields

* lisp/mail/sendmail.el (mail-combine-fields): Call `save-excursion' to
avoid losing our place in the search loop.

(cherry picked from commit 5fbba6cceaf843cfca449eb000a0a65243b61808)
---

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 58f708a0c1e..3d222090ca6 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1110,10 +1110,11 @@ to combine them into one, and does so if the user says y."
               (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