merge from trunk
commite078a23febca14bc919c5806670479c395e3253e
authorTom Tromey <tromey@redhat.com>
Sun, 6 Jan 2013 02:36:45 +0000 (5 19:36 -0700)
committerTom Tromey <tromey@redhat.com>
Sun, 6 Jan 2013 02:36:45 +0000 (5 19:36 -0700)
treee9e4ed91feef744d525264c31974c3ed00146bcd
parent63d535c829a930207b64fe733228f15a554644b1
parent7a2657fa3bedbd977f4e11fe030cb4a210c04ab4
merge from trunk
22 files changed:
configure.ac
doc/lispref/Makefile.in
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/regex.h
src/search.c
src/window.c