Merge from emacs-24; up to r117439
commit84e59fbdc3e8a2ba146839bf80375fd8d8ca78eb
authorGlenn Morris <rgm@gnu.org>
Mon, 11 Aug 2014 00:59:34 +0000 (10 17:59 -0700)
committerGlenn Morris <rgm@gnu.org>
Mon, 11 Aug 2014 00:59:34 +0000 (10 17:59 -0700)
tree991a62f2355674f48c3960c5bb84e30d35bc4f75
parent374d21701d56005786ab9b4c60bd5887a07e9b40
parent0e1d0429a9f265a1ceb95ab55a7bdb5fdc587449
Merge from emacs-24; up to r117439
15 files changed:
ChangeLog
configure.ac
lisp/ChangeLog
lisp/files.el
lisp/info.el
lisp/mouse.el
lisp/simple.el
lisp/window.el
src/ChangeLog
src/buffer.c
src/coding.c
src/fileio.c
src/fontset.c
src/window.c
test/ChangeLog