merge from trunk
commit6dacdad5fcb278e5a16b38bb81786aac9ca27be4
authorTom Tromey <tromey@redhat.com>
Sun, 7 Jul 2013 05:18:58 +0000 (6 23:18 -0600)
committerTom Tromey <tromey@redhat.com>
Sun, 7 Jul 2013 05:18:58 +0000 (6 23:18 -0600)
treef5f331ea361ba0f99e0f9b638d183ad492a7da31
parent0a6f2ff0c8ceb29703e76cddd46ea3f176dd873a
parent219afb88d9d484393418820d1c08dc93299110ec
merge from trunk

this merges frmo trunk and fixes various build issues.
this needed a few ugly tweaks.
this hangs in "make check" now
19 files changed:
configure.ac
doc/lispref/Makefile.in
doc/lispref/elisp.texi
lisp/subr.el
src/Makefile.in
src/alloc.c
src/buffer.c
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/systime.h
src/thread.c
src/thread.h
src/window.c