From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 7 Dec 2016 20:39:07 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1174
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fa8dbb61a003ece2cc08c83bda4f21f393340b2f;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

d4e1549 Guard terminal parameter in XTerm mouse mode
---

fa8dbb61a003ece2cc08c83bda4f21f393340b2f