* admin/bzrmerge.el (bzrmerge-buffer): New constant.
(bzrmerge-merges, bzrmerge-missing, bzrmerge-apply): Use it.
(bzrmerge-missing): If nothing to do, return nil not (nil).
(bzrmerge-apply): Remove odd character from message.
(bzrmerge): Give status messages.
* notes/copyright: Add aclocal.m4, m4/*.m4, lib/Makefile.in,
arg-nonnull.h, c++defs.h, compile, depcomp, missing,
warn-on-use.h, lib/*.[ch], lib/gnulib.mk. Remove src/mktime.c,
lib-src/getopt1.c, lib-src/getopt_int.h (files are now in lib and
are subsumed by the lib/*.[ch] rule). Remove m4/getopt.m4 (now
subsumed by m4/*.m4 rule). config.guess, config.sub, and
doc/man/texinfo.tex are now copied in from gnulib.
src/image.c <Qlibpng_version>: New variable.
(syms_of_image): Intern and staticpro it. Set its value to the
version of PNG library we were compiled with.
(my_png_error, png_load): Avoid GCC warnings about direct access
to png_ptr->jmpbuf.
lisp/term/w32-win.el (image-library-alist): Set up correctly for
libpng versions both before and after 1.4.0.
admin/nt/README.W32: Update the information about PNG support libraries.
nt/INSTALL: Update the information about PNG support libraries.
* doc/misc/Makefile.in (emacsdir): New variable.
($(infodir)/efaq): Pass -I $(emacsdir) to makeinfo.
* doc/misc/faq.texi (VER): Replace with EMACSVER from emacsver.texi.
* doc/lispref/Makefile.in (emacsdir): New variable.
(MAKEINFO): Add -I $emacsdir.
(dist): Copy emacsver.texi.
* doc/lispref/book-spine.texinfo, doc/lispref/elisp.texi:
* doc/lispref/vol2.texi, doc/lispref/vol1.texi:
Set EMACSVER by including emacsver.texi.
* doc/emacs/emacsver.texi.in: New file.
* doc/emacs/emacs.texi: Set EMACSVER by including emacsver.texi.
* doc/emacs/Makefile.in (distclean): Delete emacsver.texi.
(dist): Copy emacsver.texi.
* admin/admin.el (set-version): No need to act on doc/ files any more.
* configure.in (AC_OUTPUT): Add doc/emacs/emacsver.texi.
* make-dist: Include doc/emacs/*.texi.in.
* admin/admin.el: Write version number to nt/makefile.w32-in.
* admin/nt/makedist.bat: Remove; replaced with `zipdist.bat'
in the nt/ directory.
* admin/nt/README.W32: Relocate to nt/ directory.
* etc/NEWS: Document new --distfiles configure.bat option and
`dist' make target on Windows.
* nt/INSTALL: Document new dist target and add section about
creating binary distributions.
* nt/configure.bat: New parameter `--distfiles'.
* nt/makefile.w32-in: Add version number, new target `dist'.
Add new target `install-shortcuts'.
* nt/zipdist.bat: New file; create zipped binary distribution,
replaces admin/nt/makedist.bat.
admin/unidata/bidimirror.awk: New file.
admin/unidata/BidiMirroring.txt: New file from
http://www.unicode.org/Public/6.0.0/ucd/BidiMirroring-6.0.0d1.txt.
admin/unidata/Makefile.in: (../../src/bidimirror.h): New target.
(all): Depend on ../../src/biditype.h and ../../src/bidimirror.h.
admin/unidata/makefile.w32-in (../../src/bidimirror.h): New target.
(all): Depend on ../../src/biditype.h and ../../src/bidimirror.h.
src/makefile.w32-in ($(BLD)/bidi.$(O)): Depend on biditype.h and
bidimirror.h.
src/deps.mk (bidi.o): Depend on biditype.h and bidimirror.h.
src/bidi.c (bidi_initialize): Initialize bidi_mirror_table.
(bidi_mirror_char): Use bidi_mirror_table.
src/bidi.c (bidi_initialize): Remove explicit initialization of
bidi_type_table; include biditype.h instead. Don't support
entries whose second codepoint is zero.
src/biditype.h: New file.
admin/unidata/biditype.awk: New file.
admin/unidata/Makefile.in (../../src/biditype.h): New target.
admin/unidata/makefile.w32-in (../../src/biditype.h): New target.