Merge from emacs-24; up to 2012-11-20T20:06:17Z!monnier@iro.umontreal.ca
commit5c9cf0a3f9817220ed0f907637951f5cdf1a9614
authorGlenn Morris <rgm@gnu.org>
Tue, 27 Nov 2012 03:10:32 +0000 (26 19:10 -0800)
committerGlenn Morris <rgm@gnu.org>
Tue, 27 Nov 2012 03:10:32 +0000 (26 19:10 -0800)
tree05e4de196ed9935479f73f9db5d249684c7d19b4
parent848a2dd19d1b030303de1b568edf9e33281e4440
parent369f945d0b71738812f237123dbe24938d65999e
Merge from emacs-24; up to 2012-11-20T20:06:17Z!monnier@iro.umontreal.ca
ChangeLog
lisp/ChangeLog
lisp/descr-text.el
lisp/emacs-lisp/cl-macs.el
lisp/progmodes/python.el
lisp/subr.el
lisp/textmodes/table.el
src/ChangeLog
src/fontset.c
src/xdisp.c