merge from trunk
commitcc231cbe45d27a1906d268fb72d3b4105a2e9c65
authorTom Tromey <tromey@redhat.com>
Fri, 26 Jul 2013 20:02:53 +0000 (26 14:02 -0600)
committerTom Tromey <tromey@redhat.com>
Fri, 26 Jul 2013 20:02:53 +0000 (26 14:02 -0600)
treec011828e2a3a18e77eaa8849e3cccb805d798f42
parentb34a529f177a6ea32da5cb1254f91bf9d71838db
parentfec9206062b420aca84f53d05a72c3ee43244022
merge from trunk
17 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/buffer.h
src/bytecode.c
src/data.c
src/emacs.c
src/eval.c
src/lisp.h
src/print.c
src/process.c
src/search.c
src/window.c