Merge from emacs-24; up to r117592
commitfb88ede8d721d8f83264fda86c0d450d88c9ff65
authorGlenn Morris <rgm@gnu.org>
Fri, 17 Oct 2014 16:14:37 +0000 (17 09:14 -0700)
committerGlenn Morris <rgm@gnu.org>
Fri, 17 Oct 2014 16:14:37 +0000 (17 09:14 -0700)
tree5add028a18c551a79ea6b98cd103bbfde88080d6
parent2b5ed1d13884ea3f285edd347078220999a643bb
parentc300ff71c34d58850cd813319aa0ebf89191f830
Merge from emacs-24; up to r117592
src/ChangeLog
src/xterm.c