Merge with trunk
commitec15138f2343cfdf8ac4efc0be50624d47454f77
authorMartin Rudalics <rudalics@gmx.at>
Mon, 25 Oct 2010 15:26:24 +0000 (25 17:26 +0200)
committerMartin Rudalics <rudalics@gmx.at>
Mon, 25 Oct 2010 15:26:24 +0000 (25 17:26 +0200)
tree80074ecdb560550c4b71d03d1c1dd7f12a25064e
parent8e3aee2df821e7ce496adacb0918a715deb83e60
parentcbabe91fdce9313ffc3f72e0a828b86580661dac
parent28090d40d7e1209d8c434c3d2397c8cbfe715abc
Merge with trunk
24 files changed:
doc/lispref/ChangeLog
doc/lispref/elisp.texi
doc/lispref/frames.texi
lisp/ChangeLog
lisp/bindings.el
lisp/cus-start.el
lisp/dired.el
lisp/files.el
lisp/help-mode.el
lisp/help.el
lisp/loadup.el
lisp/progmodes/python.el
lisp/simple.el
lisp/window.el
src/ChangeLog
src/buffer.c
src/dispnew.c
src/frame.c
src/indent.c
src/minibuf.c
src/w32fns.c
src/window.c
src/xdisp.c
src/xfns.c