[Emacs-diffs] emacs-25 95eb641: Fix mail-combine-fields

[Noam Postavsky]

branch: emacs-25
commit 95eb641404adca84e71959a98369a30f1cadb7b6
Author: Richard Stallman <address@hidden>
Commit: Noam Postavsky <address@hidden>

    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)
---
 lisp/mail/sendmail.el |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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 @@ 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