Merge from emacs-24; up to 2012-12-12T22:29:54Z!yamaoka@jpl.org
authorGlenn Morris <rgm@gnu.org>
Wed, 30 Jan 2013 08:07:37 +0000 (00:07 -0800)
committerGlenn Morris <rgm@gnu.org>
Wed, 30 Jan 2013 08:07:37 +0000 (00:07 -0800)
commit3f82a88a05e227145b0470991050698085d19fbe
tree38b8e6b4a86c251ba02264aa01325219aaf16e4b
parent9e4ce6976d594b65c7b925fdff12a1adadb3b688
parentfe93f41aa0f701315884bf0f8d2cbc6a9f914209
Merge from emacs-24; up to 2012-12-12T22:29:54Z!yamaoka@jpl.org
lisp/ChangeLog
lisp/emacs-lisp/cl.el
lisp/imenu.el
lisp/progmodes/python.el
src/ChangeLog
src/w32.c