Merge from emacs-24
commit07bec0fc67ee0b26685f0ec7f28d9b73f67bf3de
authorStefan Monnier <monnier@iro.umontreal.ca>
Tue, 30 Sep 2014 23:19:31 +0000 (30 19:19 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Tue, 30 Sep 2014 23:19:31 +0000 (30 19:19 -0400)
tree222adf06960f86aa8b2f560217d39c9fe39d3996
parent6aed001ad31d41f028d77e66e597b7b3ab4e31ae
parentd3b7a90bc2ad20192d1afd23eb1aa6a18ceda569
Merge from emacs-24
12 files changed:
etc/ChangeLog
lisp/ChangeLog
lisp/emacs-lisp/package.el
lisp/erc/ChangeLog
lisp/mh-e/ChangeLog
lisp/progmodes/python.el
src/ChangeLog
src/dispnew.c
src/w32fns.c
src/w32term.c
src/window.c
src/xdisp.c