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

; Merge from origin/emacs-25

The following commit was skipped:

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

8cd0d5df81a1cd4ed2187ac4b5a4202f3ad46c67