Merge from origin/emacs-24

The following commit was skipped:

432b00e Fix assertions in popping up menus on TTY  (Bug#19862)
This commit is contained in:
Paul Eggert 2015-03-03 14:39:12 -08:00
commit 36a50f38fb

Diff content is not available