merge from trunk
commit3d6eced1ae51ffd0a782130e7c334052277e2724
authorTom Tromey <tromey@redhat.com>
Mon, 17 Dec 2012 14:56:22 +0000 (17 07:56 -0700)
committerTom Tromey <tromey@redhat.com>
Mon, 17 Dec 2012 14:56:22 +0000 (17 07:56 -0700)
tree5d1d2ad7cd3374f922886c4a72062511a035c168
parentbf69f522a9e135f9aa483cedd53e71e915f2bf75
parent7c3d167f48d6262ee4e5512aa50a07ee96bc1509
merge from trunk
20 files changed:
configure.ac
doc/lispref/elisp.texi
doc/lispref/objects.texi
doc/lispref/processes.texi
lisp/subr.el
src/Makefile.in
src/alloc.c
src/buffer.c
src/buffer.h
src/bytecode.c
src/data.c
src/emacs.c
src/eval.c
src/lisp.h
src/print.c
src/process.c
src/process.h
src/regex.c
src/search.c
src/window.c