Merge from origin/emacs-25

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

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 4c0f2b98257c3c9565bf6730168cbd6433133292..58f708a0c1e0aef14e6563706373d0f54a93066d 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1,6 +1,6 @@
 ;;; sendmail.el --- mail sending commands for Emacs
 
-;; Copyright (C) 1985-1986, 1992-1996, 1998, 2000-2015 Free Software
+;; Copyright (C) 1985-1986, 1992-1996, 1998, 2000-2016 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
@@ -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))
@@ -2078,7 +2078,6 @@ you can move to one of them and type C-c C-c to recover that one."
 
 ;; Local Variables:
 ;; byte-compile-dynamic: t
-;; coding: utf-8
 ;; End:
 
 ;;; sendmail.el ends here