]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 14649c8 604f656)
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 7 Jun 2016 16:34:27 +0000 (09:34 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 7 Jun 2016 16:34:27 +0000 (09:34 -0700)
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...

1  2 
lisp/emacs-lisp/lisp-mode.el patch | diff1 | diff2 | blob | history
test/lisp/emulation/viper-tests.el patch | diff1 | diff2 | blob | history

diff --cc lisp/emacs-lisp/lisp-mode.el
Simple merge
diff --cc test/lisp/emulation/viper-tests.el
Simple merge