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

Merge from origin/emacs-24

The following commit was skipped:

432b00e Fix assertions in popping up menus on TTY  (Bug#19862)
---

36a50f38fbbcf5cc0cafc44af9d1bfcd6c13fc25