Merge from origin/emacs-25
commit5feeead12693cd97c6d77b14ef05d29ba5cf18bb
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 7 Jun 2016 16:34:27 +0000 (7 09:34 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 7 Jun 2016 16:34:27 +0000 (7 09:34 -0700)
tree94d4e8ab4586c3a247a95cf43d2eec482dfc0b04
parent14649c889083ba9cc685846e508864830bdc0c9f
parent604f6568312aef8287d7a3ac1dbeb71577089bec
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...
lisp/emacs-lisp/lisp-mode.el
test/lisp/emulation/viper-tests.el