From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 23 Mar 2015 17:16:40 +0000 (-0700)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2564^2~94
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=821b6002127fba1e5b57d39e63eabd0ae189f6af;p=emacs.git

Merge from origin/emacs-24

The following commit was skipped:

ae3d733 Backport 20156 fix (stack corruption)
---

821b6002127fba1e5b57d39e63eabd0ae189f6af