Merge from emacs-24; up to r117476
commit0f8bfc75b9234e2cf1b1c31d9373f91907bb2937
authorGlenn Morris <rgm@gnu.org>
Wed, 3 Sep 2014 04:21:40 +0000 (2 21:21 -0700)
committerGlenn Morris <rgm@gnu.org>
Wed, 3 Sep 2014 04:21:40 +0000 (2 21:21 -0700)
treea8b697618aee894a3cf52d2f07c936c21d7a24f8
parent704596b957efdc5398859874de33b8f88fa489c3
parent3c803300d160281271d795ec66537010d5710af6
Merge from emacs-24; up to r117476
13 files changed:
lisp/ChangeLog
lisp/emacs-lisp/package.el
lisp/progmodes/gud.el
lisp/progmodes/python.el
lisp/startup.el
lisp/subr.el
src/ChangeLog
src/conf_post.h
src/dispnew.c
src/eval.c
src/xdisp.c
test/ChangeLog
test/indent/scheme.scm