From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 3 Mar 2015 22:36:09 +0000 (-0800)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2564^2~239
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8462361f2d087d6f7c745305c61a266843ee19c;p=emacs.git

Merge from origin/emacs-24

The following commit was skipped:

4f5033f Backport the :end-of-capability fix
---

d8462361f2d087d6f7c745305c61a266843ee19c