summaryrefslogtreecommitdiff
path: root/lisp/mail
diff options
context:
space:
mode:
authorRichard Stallman <rms@gnu.org>2016-09-02 21:55:09 -0400
committerNoam Postavsky <npostavs@gmail.com>2016-09-03 11:46:50 -0400
commit5fbba6cceaf843cfca449eb000a0a65243b61808 (patch)
tree7dbb8df108ee10a2a1d075e112ed46c1c01e1d3e /lisp/mail
parent5a4bffb6617a274ca19bc7f5c1b1ceb6345651ab (diff)
downloademacs-5fbba6cceaf843cfca449eb000a0a65243b61808.tar.gz
Fix mail-combine-fields
* lisp/mail/sendmail.el (mail-combine-fields): Call `save-excursion' to avoid losing our place in the search loop.
Diffstat (limited to 'lisp/mail')
-rw-r--r--lisp/mail/sendmail.el9
1 files changed, 5 insertions, 4 deletions
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