Merge from trunk
commit441c905b118614648612c06f43b338c3aa59bc99
authorMartin Rudalics <rudalics@gmx.at>
Fri, 19 Nov 2010 16:29:01 +0000 (19 17:29 +0100)
committerMartin Rudalics <rudalics@gmx.at>
Fri, 19 Nov 2010 16:29:01 +0000 (19 17:29 +0100)
treeb559654b6cd9584bd18d62de84cff7152f4ec823
parent7cd6e1a6fbd7f2307050fc93858acbedbf68c7f4
parent68a1690558e715a73ab21e8eb72236159c4d2df2
Merge from trunk
14 files changed:
doc/lispref/ChangeLog
lisp/ChangeLog
lisp/calendar/calendar.el
lisp/electric.el
lisp/files.el
lisp/gnus/ChangeLog
lisp/minibuffer.el
lisp/printing.el
lisp/progmodes/python.el
lisp/simple.el
lisp/speedbar.el
src/ChangeLog
src/minibuf.c
src/xdisp.c