; Merge from origin/emacs-25
commitfa8dbb61a003ece2cc08c83bda4f21f393340b2f
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:39:07 +0000 (7 12:39 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:39:07 +0000 (7 12:39 -0800)
tree4ab4226dde37835328f037459ac9dcaf17a5bc22
parent401394d20b0ee431e52af84b1ca54c91d2926fd9
parentd4e15492f7c55eabdadc6f3735b84972748e6c0d
; Merge from origin/emacs-25

The following commit was skipped:

d4e1549 Guard terminal parameter in XTerm mouse mode