; Merge from origin/emacs-25
commit8d9ad899f11ec2a6763617ba069fdaf3889ac4e1
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2016 21:05:10 +0000 (5 14:05 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2016 21:05:10 +0000 (5 14:05 -0700)
tree459e59d1dbc928a8dd3e25656544a3e287a778aa
parentb76885f1dadf419fc9eb3f5f10ea5550b6e06a1a
parent7f83e7e5367cc11071a628a6ff7ba0c050a80c6d
; Merge from origin/emacs-25

The following commit was skipped:

7f83e7e Fix slow redisplay in term-mode