; Merge from origin/emacs-26
commit194c530034e9413071bcdc92d573b2916363ebf1
authorGlenn Morris <rgm@gnu.org>
Sat, 20 Jan 2018 16:23:30 +0000 (20 08:23 -0800)
committerGlenn Morris <rgm@gnu.org>
Sat, 20 Jan 2018 16:23:30 +0000 (20 08:23 -0800)
tree0832cbdf9699c35d27f61696edacfaad70c3d7d3
parentec6ef1e38b2618b3c5bdd28e2d4dac0afa2b3033
parent5472568a3c2338856d25380012ee4398e024c806
; Merge from origin/emacs-26

The following commit was skipped:

5472568 Handle split AnSiT messages for term.el (Bug#17231)