From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 7 Jun 2016 16:34:27 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/5feeead12693cd97c6d77b14ef05d29ba5cf18bb

Merge from origin/emacs-25

604f656 * test/automated/viper-tests.el (viper-test-undo-kmacro): Del...
20eb531 * lisp/mail/footnote.el (footnote-mode): Fix doc typo.
a7a2244 * doc/misc/smtpmail.texi (Encryption): Fix 2012-12-22 typo.
07bd972 * lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): Fix...
---

5feeead12693cd97c6d77b14ef05d29ba5cf18bb