Merge from trunk
commitc530e1c2a3a036d71942c354ba11b30a06341fd7
authorStefan Monnier <monnier@iro.umontreal.ca>
Sat, 12 Feb 2011 02:27:53 +0000 (11 21:27 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Sat, 12 Feb 2011 02:27:53 +0000 (11 21:27 -0500)
tree184fa6b6c9bb58855aa9f1ae6cded97edc4f10fb
parent295fb2ac59b66c0e2470325a42c8e58c135ed044
parente0e36cac4adaa32ad755a34c811366dd8e4655bc
Merge from trunk
25 files changed:
aclocal.m4
configure
doc/lispref/elisp.texi
doc/lispref/vol1.texi
doc/lispref/vol2.texi
lisp/ChangeLog.trunk
lisp/dired.el
lisp/emacs-lisp/edebug.el
lisp/server.el
lisp/simple.el
src/ChangeLog.trunk
src/alloc.c
src/buffer.c
src/callint.c
src/config.in
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