; Merge from origin/emacs-25
commit8cd0d5df81a1cd4ed2187ac4b5a4202f3ad46c67
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:41:04 +0000 (7 12:41 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:41:04 +0000 (7 12:41 -0800)
treecff0c6b05099fcaa51dae8e1c042528cdb318925
parentc5532f5a5c304134ecb0367997402c2935d6030c
parentf6da59737603091c67aee7bc912d3b164350314c
; Merge from origin/emacs-25

The following commit was skipped:

f6da597 ; Revert "Guard terminal par. in XTerm mouse mode"