* lisp/mail/rmail.el (rmail-resend): Use `with-syntax-table`

(cherry picked from commit 3599a9a1cf1f8bed7c7f00fd8f00b2bfc0c4271f)

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 7006d59be6686c06a4657d1f4e47c417ba9f921f..d422383acdf6cfb5ea06c5d8c587521e00d77d1d 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4095,20 +4095,18 @@ typically for purposes of moderating a list."
            (save-excursion
              (if (featurep 'mailabbrev)
                  (let ((end (point-marker))
-                       (local-abbrev-table mail-abbrevs)
-                       (old-syntax-table (syntax-table)))
+                       (local-abbrev-table mail-abbrevs))
                    (if (and (not (obarrayp mail-abbrevs))
                             (file-exists-p mail-personal-alias-file))
                        (build-mail-abbrevs))
                    (unless mail-abbrev-syntax-table
                      (mail-abbrev-make-syntax-table))
-                   (set-syntax-table mail-abbrev-syntax-table)
-                   (goto-char before)
-                   (while (and (< (point) end)
-                               (progn (forward-word-strictly 1)
-                                      (<= (point) end)))
-                     (expand-abbrev))
-                   (set-syntax-table old-syntax-table))
+                   (with-syntax-table mail-abbrev-syntax-table
+                     (goto-char before)
+                     (while (and (< (point) end)
+                                 (progn (forward-word-strictly 1)
+                                        (<= (point) end)))
+                       (expand-abbrev))))
                (expand-mail-aliases before (point)))))
          ;;>> Set up comment, if any.
          (if (and (sequencep comment) (not (zerop (length comment))))