Merge from emacs-24; up to r110966
commit42ecc92bdcccb75c60f953b2c12900f4ffeca035
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)
tree70f4c6d0ba6cdde34fbc1b62a1ea15c7c5d981ef
parent75385ed88e29571c244955acaae9ff611ffecb70
parent30d1155d5c1b7d03814388a75b616d60ce004102
Merge from emacs-24; up to r110966
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