merge from trunk
commit793ea5055aea85ff9227e1bf0c84ab37edba7201
authorTom Tromey <tromey@redhat.com>
Sun, 25 Aug 2013 20:25:59 +0000 (25 14:25 -0600)
committerTom Tromey <tromey@redhat.com>
Sun, 25 Aug 2013 20:25:59 +0000 (25 14:25 -0600)
treec9799eebe2b797a55fcbfcbd3710c9b5aa70051d
parent1ce4c6398ea453a66f6943552b0ec866a690e9b1
parente687aa335a21662f67d2d73063272504a171ffab
merge from trunk
configure.ac
src/alloc.c
src/lisp.h
src/process.c
src/process.h
src/window.c