From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 5 Aug 2016 21:05:10 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1799
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8d9ad899f11ec2a6763617ba069fdaf3889ac4e1;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

7f83e7e Fix slow redisplay in term-mode
---

8d9ad899f11ec2a6763617ba069fdaf3889ac4e1