Merge from trunk
authorStefan Monnier <monnier@iro.umontreal.ca>
Mon, 21 Mar 2011 16:42:16 +0000 (12:42 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Mon, 21 Mar 2011 16:42:16 +0000 (12:42 -0400)
commitcafdcef32d55cbb44389d7e322e7f973cbb72dfd
tree7ee0c41ea8a589650ce6f4311fb10e61a63807b9
parenta08a25d7aaf251aa18f2ef747be53734bc55cae9
parent4e05e67e4cd0bc1b0a4ef3176a4d0d91c6b3738e
Merge from trunk
31 files changed:
doc/lispref/ChangeLog.trunk
lisp/ChangeLog.trunk
lisp/custom.el
lisp/dired.el
lisp/emacs-lisp/bytecomp.el
lisp/emacs-lisp/cl-loaddefs.el
lisp/files.el
lisp/help-fns.el
lisp/minibuffer.el
lisp/server.el
lisp/simple.el
lisp/startup.el
lisp/subr.el
lisp/vc/diff-mode.el
src/ChangeLog.trunk
src/alloc.c
src/buffer.c
src/bytecode.c
src/callint.c
src/data.c
src/doc.c
src/eval.c
src/fns.c
src/image.c
src/keyboard.c
src/lisp.h
src/lread.c
src/minibuf.c
src/print.c
src/window.c
src/window.h