From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 19 Jun 2015 23:45:50 +0000 (-0700)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~1699
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/f95211e9a40b1c7d1beff0e15aa67450f80bd8bb

Merge from origin/emacs-24

a5e6f33 Fixes: debbugs:20832
b9f02cf Fixes: debbugs:20832
---

f95211e9a40b1c7d1beff0e15aa67450f80bd8bb