Merge from emacs-24; up to r117423
commitc88913c09d86e6b3ec4998941720f569d59f4435
authorGlenn Morris <rgm@gnu.org>
Sun, 3 Aug 2014 20:34:33 +0000 (3 16:34 -0400)
committerGlenn Morris <rgm@gnu.org>
Sun, 3 Aug 2014 20:34:33 +0000 (3 16:34 -0400)
treeebff864f3c42059430dcf45a2bba3867085350b3
parent5c2ad09c8e4261553000aba79767d5a2e345296a
parentd17faf36b0949f23d948d1c8c340fc60a5c635f6
Merge from emacs-24; up to r117423
src/ChangeLog
src/dired.c
src/xterm.c
src/xterm.h