merge from trunk
commit6d75555c5cc3d2a629646cee7629e67530fa7a36
authorTom Tromey <tromey@redhat.com>
Tue, 20 Aug 2013 03:53:07 +0000 (19 21:53 -0600)
committerTom Tromey <tromey@redhat.com>
Tue, 20 Aug 2013 03:53:07 +0000 (19 21:53 -0600)
tree3852804dd234ad613ea8691332e10b92c027e87d
parentcc231cbe45d27a1906d268fb72d3b4105a2e9c65
parent8c2f38aaab7a7a2f0605416fc2ee38701e41ab61
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/data.c
src/emacs.c
src/eval.c
src/lisp.h
src/process.c
src/process.h
src/regex.c
src/search.c
src/window.c