Merge from trunk
commitb985cfb12aae79be89623fd658b86f7faaba0924
authorMartin Rudalics <rudalics@gmx.at>
Sat, 30 Oct 2010 09:38:26 +0000 (30 11:38 +0200)
committerMartin Rudalics <rudalics@gmx.at>
Sat, 30 Oct 2010 09:38:26 +0000 (30 11:38 +0200)
treebf9c50e9b161c2008c5baf70eba36a544682b331
parent02f4c3a0b8819c3e79a843e64792ef480c4afcde
parent99e65b2d2e79edf3ed0c4f00916098d4ea3767f4
Merge from trunk
lisp/ChangeLog
lisp/cus-start.el
lisp/files.el
lisp/simple.el
src/ChangeLog
src/buffer.c
src/frame.c
src/w32fns.c
src/xfns.c