Merge from origin/emacs-25

[gnu-emacs] / lisp / mail / sendmail.el

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 5ab5bd9a2cda6ac43e1db985be731c1d949ce680..58f708a0c1e0aef14e6563706373d0f54a93066d 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1404,7 +1404,7 @@ just append to the file, in Babyl format if necessary."
        (insert "\nFrom " (user-login-name) " " (current-time-string time) "\n")
        ;; Insert the time zone before the year.
        (forward-char -1)
-       (forward-word -1)
+       (forward-word-strictly -1)
        (require 'mail-utils)
        (insert (mail-rfc822-time-zone time) " ")
        (goto-char (point-max))