Merge from emacs-24; up to r117412
commitc7dc7052d94a19476bd8037d680162fd7f51c361
authorGlenn Morris <rgm@gnu.org>
Mon, 28 Jul 2014 09:39:09 +0000 (28 05:39 -0400)
committerGlenn Morris <rgm@gnu.org>
Mon, 28 Jul 2014 09:39:09 +0000 (28 05:39 -0400)
tree7baff4aa33d546b45099243351fdc3657b4bfc7a
parent399fe8b6ce3987fa585a15246dbcd3c586a4f9be
parentaab34590833849e8388cfed1da2a193bc8fe6733
Merge from emacs-24; up to r117412
13 files changed:
doc/misc/ChangeLog
doc/misc/todo-mode.texi
etc/NEWS
lisp/ChangeLog
lisp/files.el
lisp/progmodes/prolog.el
lisp/progmodes/python.el
lisp/vc/vc-hooks.el
lisp/window.el
src/.gdbinit
src/ChangeLog
src/dispnew.c
src/window.c